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.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 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	if (!$GRAB) {
46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47	if (length $widget->{tooltip}) {
48
49	if ($TOOLTIP->{owner} != $widget) {
50	$TOOLTIP->hide;
51
52	$TOOLTIP->{owner} = $widget;
53
54	my $tip = $widget->{tooltip};
55
56	$tip = $tip->($widget) if CODE:: eq ref $tip;
57
58	$TOOLTIP->set_tooltip_from ($widget);
59	$TOOLTIP->show;
60	}
61
62	return;
63	}
64	}
65	}
66
67	$TOOLTIP->hide;
68	delete $TOOLTIP->{owner};
69	}
70
71	# class methods for events	73	# class methods for events
72	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
73	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
74	if $FOCUS;	76	if $FOCUS;
75	}	77	}
…		…
87	my $widget = $ROOT->find_widget ($x, $y);	89	my $widget = $ROOT->find_widget ($x, $y);
88		90
89	$GRAB = $widget;	91	$GRAB = $widget;
90	$GRAB->update if $GRAB;	92	$GRAB->update if $GRAB;
91		93
92	check_tooltip;	94	$TOOLTIP_WATCHER->cb->();
93	}	95	}
94		96
95	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
96		98
97	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
…		…
112	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
113	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
114	$grab->update if $grab;	116	$grab->update if $grab;
115	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
116		118
117	check_tooltip;	119	$TOOLTIP_WATCHER->cb->();
118	}	120	}
119	}	121	}
120		122
121	sub feed_sdl_motion_event {	123	sub feed_sdl_motion_event {
122	my ($ev) = @_;	124	my ($ev) = @_;
…		…
128	my $hover = $HOVER; $HOVER = $widget;	130	my $hover = $HOVER; $HOVER = $widget;
129		131
130	$hover->update if $hover && $hover->{can_hover};	132	$hover->update if $hover && $hover->{can_hover};
131	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
132		134
133	check_tooltip;	135	$TOOLTIP_WATCHER->start;
134	}	136	}
135		137
136	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137	if $HOVER;	139	if $HOVER;
138	}	140	}
…		…
170	sub rescale_widgets {	172	sub rescale_widgets {
171	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
172		174
173	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
174	if ($widget->{is_toplevel}) {	176	if ($widget->{is_toplevel}) {
175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	177	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	178	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177		179
178	$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.]+$/;
179	$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};
180	$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};
181	$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.]+$/;
182	$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};
183	$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};
184		186
185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	187	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	188	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187		189
188	}	190	}
189	}	191	}
190		192
191	reconfigure_widgets;	193	reconfigure_widgets;
…		…
276	delete $self->{visible};	278	delete $self->{visible};
277		279
278	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
279	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
280		282
281	CFClient::UI::check_tooltip	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
282	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
283		285
284	$self->focus_out;	286	$self->focus_out;
285		287
286	$self->emit (visibility_change => 0);	288	$self->emit (visibility_change => 0);
…		…
370	sub size_allocate {	372	sub size_allocate {
371	# nothing to be done	373	# nothing to be done
372	}	374	}
373		375
374	sub children {	376	sub children {
		377	# nop
		378	}
		379
		380	sub visible_children {
		381	$_[0]->children
375	}	382	}
376		383
377	sub set_max_size {	384	sub set_max_size {
378	my ($self, $w, $h) = @_;	385	my ($self, $w, $h) = @_;
379		386
380	delete $self->{max_w}; $self->{max_w} = $w if $w;	387	$self->{max_w} = int $w if defined $w;
381	delete $self->{max_h}; $self->{max_h} = $h if $h;	388	$self->{max_h} = int $h if defined $h;
		389
		390	$self->realloc;
382	}	391	}
383		392
384	sub set_tooltip {	393	sub set_tooltip {
385	my ($self, $tooltip) = @_;	394	my ($self, $tooltip) = @_;
386		395
…		…
391		400
392	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
393		402
394	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
396	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
397	}	406	}
398	}	407	}
399		408
400	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
401	sub coord2local {	410	sub coord2local {
…		…
438		447
439	$::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
440	unless $FOCUS;	449	unless $FOCUS;
441	}	450	}
442		451
443	sub mouse_motion { }	452	sub mouse_motion { 0 }
444	sub button_up { }	453	sub button_up { 0 }
445	sub key_down { }	454	sub key_down { 0 }
446	sub key_up { }	455	sub key_up { 0 }
447		456
448	sub button_down {	457	sub button_down {
449	my ($self, $ev, $x, $y) = @_;	458	my ($self, $ev, $x, $y) = @_;
450		459
451	$self->focus_in;	460	$self->focus_in;
452	}
453		461
454	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	462	0
455	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	463	}
456	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
457	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
458	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459		464
460	sub find_widget {	465	sub find_widget {
461	my ($self, $x, $y) = @_;	466	my ($self, $x, $y) = @_;
462		467
463	return () unless $self->{can_events};	468	return () unless $self->{can_events};
…		…
525		530
526	$self->realloc;	531	$self->realloc;
527	$self->update;	532	$self->update;
528	}	533	}
529		534
		535	# using global variables seems a bit hacky, but passing through all drawing
		536	# functions seems pointless.
		537	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		538
530	sub draw {	539	sub draw {
531	my ($self) = @_;	540	my ($self) = @_;
532		541
533	return unless $self->{h} && $self->{w};	542	return unless $self->{h} && $self->{w};
		543
		544	# update screen rectangle
		545	local $draw_x = $draw_x + $self->{x};
		546	local $draw_y = $draw_y + $self->{y};
		547	local $draw_w = $draw_x + $self->{w};
		548	local $draw_h = $draw_y + $self->{h};
		549
		550	# skip widgets that are entirely outside the drawing area
		551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534		553
535	glPushMatrix;	554	glPushMatrix;
536	glTranslate $self->{x}, $self->{y}, 0;	555	glTranslate $self->{x}, $self->{y}, 0;
537	$self->_draw;
538	glPopMatrix;
539		556
540	if ($self == $HOVER && $self->{can_hover}) {	557	if ($self == $HOVER && $self->{can_hover}) {
541	my ($x, $y) = @$self{qw(x y)};
542
543	glColor 1, 0.8, 0.5, 0.2;	558	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544	glEnable GL_BLEND;	559	glEnable GL_BLEND;
545	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546	glBegin GL_QUADS;	561	glBegin GL_QUADS;
547	glVertex $x , $y;	562	glVertex 0 , 0;
548	glVertex $x + $self->{w}, $y;	563	glVertex $self->{w}, 0;
549	glVertex $x + $self->{w}, $y + $self->{h};	564	glVertex $self->{w}, $self->{h};
550	glVertex $x , $y + $self->{h};	565	glVertex 0 , $self->{h};
551	glEnd;	566	glEnd;
552	glDisable GL_BLEND;	567	glDisable GL_BLEND;
553	}	568	}
554		569
555	if ($ENV{CFPLUS_DEBUG} & 1) {	570	if ($ENV{CFPLUS_DEBUG} & 1) {
556	glPushMatrix;	571	glPushMatrix;
557	glColor 1, 1, 0, 1;	572	glColor 1, 1, 0, 1;
558	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	573	glTranslate 0.375, 0.375;
559	glBegin GL_LINE_LOOP;	574	glBegin GL_LINE_LOOP;
560	glVertex 0 , 0;	575	glVertex 0 , 0;
561	glVertex $self->{w} - 1, 0;	576	glVertex $self->{w} - 1, 0;
562	glVertex $self->{w} - 1, $self->{h} - 1;	577	glVertex $self->{w} - 1, $self->{h} - 1;
563	glVertex 0 , $self->{h} - 1;	578	glVertex 0 , $self->{h} - 1;
564	glEnd;	579	glEnd;
565	glPopMatrix;	580	glPopMatrix;
566	#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;
567	}	582	}
		583
		584	$self->_draw;
		585	glPopMatrix;
568	}	586	}
569		587
570	sub _draw {	588	sub _draw {
571	my ($self) = @_;	589	my ($self) = @_;
572		590
…		…
610		628
611	if ($color && (@$color < 4 || $color->[3])) {	629	if ($color && (@$color < 4 || $color->[3])) {
612	my ($w, $h) = @$self{qw(w h)};	630	my ($w, $h) = @$self{qw(w h)};
613		631
614	glEnable GL_BLEND;	632	glEnable GL_BLEND;
615	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	633	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616	glColor @$color;	634	glColor_premultiply @$color;
617		635
618	glBegin GL_QUADS;	636	glBegin GL_QUADS;
619	glVertex 0 , 0;	637	glVertex 0 , 0;
620	glVertex 0 , $h;	638	glVertex 0 , $h;
621	glVertex $w, $h;	639	glVertex $w, $h;
…		…
652	our @ISA = CFClient::UI::Base::;	670	our @ISA = CFClient::UI::Base::;
653		671
654	sub new {	672	sub new {
655	my ($class, %arg) = @_;	673	my ($class, %arg) = @_;
656		674
657	my $children = delete $arg{children} || [];	675	my $children = delete $arg{children};
658		676
659	my $self = $class->SUPER::new (	677	my $self = $class->SUPER::new (
660	children => [],	678	children => [],
661	can_events => 0,	679	can_events => 0,
662	%arg,	680	%arg,
663	);	681	);
		682
664	$self->add ($_) for @$children;	683	$self->add (@$children)
		684	if $children;
665		685
666	$self	686	$self
667	}	687	}
668		688
669	sub add {	689	sub add {
…		…
717	$x -= $self->{x};	737	$x -= $self->{x};
718	$y -= $self->{y};	738	$y -= $self->{y};
719		739
720	my $res;	740	my $res;
721		741
722	for (reverse @{ $self->{children} }) {	742	for (reverse $self->visible_children) {
723	$res = $_->find_widget ($x, $y)	743	$res = $_->find_widget ($x, $y)
724	and return $res;	744	and return $res;
725	}	745	}
726		746
727	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	747	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
776	$self->{children}[0]->configure (0, 0, $w, $h);	796	$self->{children}[0]->configure (0, 0, $w, $h);
777	}	797	}
778		798
779	#############################################################################	799	#############################################################################
780		800
		801	# back-buffered drawing area
		802
781	package CFClient::UI::Window;	803	package CFClient::UI::Window;
782		804
783	our @ISA = CFClient::UI::Bin::;	805	our @ISA = CFClient::UI::Bin::;
784		806
785	use CFClient::OpenGL;	807	use CFClient::OpenGL;
…		…
803	$self->SUPER::size_allocate ($w, $h);	825	$self->SUPER::size_allocate ($w, $h);
804	$self->update;	826	$self->update;
805	}	827	}
806		828
807	sub _render {	829	sub _render {
		830	my ($self) = @_;
		831
808	$_[0]{children}[0]->draw;	832	$self->{children}[0]->draw;
809	}	833	}
810		834
811	sub render_child {	835	sub render_child {
812	my ($self) = @_;	836	my ($self) = @_;
813		837
814	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	838	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815	glClearColor 0, 0, 0, 0;	839	glClearColor 0, 0, 0, 0;
816	glClear GL_COLOR_BUFFER_BIT;	840	glClear GL_COLOR_BUFFER_BIT;
817		841
		842	{
		843	package CFClient::UI::Base;
		844
		845	($draw_x, $draw_y, $draw_w, $draw_h) =
		846	(0, 0, $self->{w}, $self->{h});
		847	}
		848
818	$self->_render;	849	$self->_render;
819	};	850	};
820	}	851	}
821		852
822	sub _draw {	853	sub _draw {
823	my ($self) = @_;	854	my ($self) = @_;
824		855
825	my ($w, $h) = ($self->w, $self->h);	856	my ($w, $h) = @$self{qw(w h)};
826		857
827	my $tex = $self->{texture}	858	my $tex = $self->{texture}
828	or return;	859	or return;
829		860
830	glEnable GL_TEXTURE_2D;	861	glEnable GL_TEXTURE_2D;
831	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832	glColor 1, 1, 1, 1;	863	glColor 0, 0, 0, 1;
833		864
834	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835		866
836	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
837	}	868	}
…		…
913	}	944	}
914		945
915	sub _render {	946	sub _render {
916	my ($self) = @_;	947	my ($self) = @_;
917		948
		949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		950	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		951
918	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919		953
920	$self->SUPER::_render;	954	$self->SUPER::_render;
921	}	955	}
922		956
…		…
925	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
926		960
927	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
928		962
929	sub new {	963	sub new {
930	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
931		967
932	my $self;	968	my $self;
933		969
934	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
935	vertical => 1,	971	vertical => 1,
…		…
940	;	976	;
941		977
942	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
943	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
944	slider => $slider,	980	slider => $slider,
945	@_,	981	%arg,
946	);	982	);
947		983
948	$self->{vp}->add ($self->{scrolled});
949	$self->add ($self->{vp});
950	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
951		986
952	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
953	}	994	}
954		995
955	sub update {	996	sub update {
956	my ($self) = @_;	997	my ($self) = @_;
957		998
…		…
996		1037
997	if ($self->{bg}) {	1038	if ($self->{bg}) {
998	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
999		1040
1000	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
1001	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
1003		1044
1004	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
1005	glVertex 0 , 0;	1046	glVertex 0 , 0;
1006	glVertex 0 , $h;	1047	glVertex 0 , $h;
1007	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1029	my @border =	1070	my @border =
1030	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031	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);
1032		1073
1033	sub new {	1074	sub new {
1034	my $class = shift;	1075	my ($class, %arg) = @_;
		1076
		1077	my $title = delete $arg{title};
1035		1078
1036	my $self = $class->SUPER::new (	1079	my $self = $class->SUPER::new (
1037	bg => [1, 1, 1, 1],	1080	bg => [1, 1, 1, 1],
1038	border_bg => [1, 1, 1, 1],	1081	border_bg => [1, 1, 1, 1],
1039	border => 0.6,	1082	border => 0.6,
1040	can_events => 1,	1083	can_events => 1,
1041	min_w => 16,	1084	min_w => 16,
1042	min_h => 16,	1085	min_h => 16,
1043	@_	1086	%arg,
1044	);	1087	);
1045		1088
1046	$self->{title} &&= new CFClient::UI::Label	1089	$self->{title} = new CFClient::UI::Label
1047	align => 0,	1090	align => 0,
1048	valign => 1,	1091	valign => 1,
1049	text => $self->{title},	1092	text => $title,
1050	fontsize => $self->{border};	1093	fontsize => $self->{border}
		1094	if defined $title;
1051		1095
1052	$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};
1053	}	1104	}
1054		1105
1055	sub border {	1106	sub border {
1056	int $_[0]{border} * $::FONTSIZE	1107	int $_[0]{border} * $::FONTSIZE
1057	}	1108	}
1058		1109
1059	sub size_request {	1110	sub size_request {
1060	my ($self) = @_;	1111	my ($self) = @_;
		1112
		1113	$self->{title}->size_request
		1114	if $self->{title};
1061		1115
1062	my ($w, $h) = $self->SUPER::size_request;	1116	my ($w, $h) = $self->SUPER::size_request;
1063		1117
1064	(	1118	(
1065	$w + $self->border * 2,	1119	$w + $self->border * 2,
…		…
1068	}	1122	}
1069		1123
1070	sub size_allocate {	1124	sub size_allocate {
1071	my ($self, $w, $h) = @_;	1125	my ($self, $w, $h) = @_;
1072		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
1073	$h -= List::Util::max 0, $self->border * 2;	1135	$h -= List::Util::max 0, $border * 2;
1074	$w -= List::Util::max 0, $self->border * 2;	1136	$w -= List::Util::max 0, $border * 2;
1075		1137
1076	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077	if $self->{title};
1078
1079	$self->child->configure ($self->border, $self->border, $w, $h);	1138	$self->child->configure ($border, $border, $w, $h);
1080	}	1139	}
1081		1140
1082	sub button_down {	1141	sub button_down {
1083	my ($self, $ev, $x, $y) = @_;	1142	my ($self, $ev, $x, $y) = @_;
1084		1143
…		…
1103	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1104		1163
1105	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107		1166
		1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108	$self->realloc;	1168	$self->realloc;
1109	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110	};	1169	};
1111		1170
1112	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1113	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1117	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1118		1177
1119	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1120		1179
1121	$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});
1122	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
1123	}	1188	1
1124	}	1189	}
1125		1190
1126	sub button_up {	1191	sub button_up {
1127	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1128		1193
1129	delete $self->{motion};	1194	!!delete $self->{motion}
1130	}	1195	}
1131		1196
1132	sub mouse_motion {	1197	sub mouse_motion {
1133	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
1134		1199
1135	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
1136	}	1203	}
1137		1204
1138	sub _draw {	1205	sub _draw {
1139	my ($self) = @_;	1206	my ($self) = @_;
1140		1207
		1208	my $child = $self->{children}[0];
		1209
1141	my ($w, $h ) = ($self->{w}, $self->{h});	1210	my ($w, $h ) = ($self->{w}, $self->{h});
1142	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1211	my ($cw, $ch) = ($child->{w}, $child->{h});
1143		1212
1144	glEnable GL_TEXTURE_2D;	1213	glEnable GL_TEXTURE_2D;
1145	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146		1215
1147	my $border = $self->border;	1216	my $border = $self->border;
…		…
1162	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1231	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163	}	1232	}
1164		1233
1165	glDisable GL_TEXTURE_2D;	1234	glDisable GL_TEXTURE_2D;
1166		1235
1167	$self->{title}->draw if $self->{title};
1168
1169	$self->child->draw;	1236	$child->draw;
		1237
		1238	if ($self->{title}) {
		1239	glTranslate 0, $border - $self->{h};
		1240	$self->{title}->_draw;
		1241	}
1170	}	1242	}
1171		1243
1172	#############################################################################	1244	#############################################################################
1173		1245
1174	package CFClient::UI::Table;	1246	package CFClient::UI::Table;
…		…
1467		1539
1468	delete $self->{texture};	1540	delete $self->{texture};
1469	$self->SUPER::update;	1541	$self->SUPER::update;
1470	}	1542	}
1471		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1472	sub set_text {	1551	sub set_text {
1473	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1474		1553
1475	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1476	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1477		1556
1478	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
1480		1559
		1560	delete $self->{size_req};
1481	$self->realloc;	1561	$self->realloc;
1482	$self->update;	1562	$self->update;
1483	}	1563	}
1484		1564
1485	sub set_markup {	1565	sub set_markup {
…		…
1491	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492		1572
1493	$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;
1494	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
1495		1575
		1576	delete $self->{size_req};
1496	$self->realloc;	1577	$self->realloc;
1497	$self->update;	1578	$self->update;
1498	}	1579	}
1499		1580
1500	sub size_request {	1581	sub size_request {
1501	my ($self) = @_;	1582	my ($self) = @_;
1502		1583
		1584	$self->{size_req} ||= do {
1503	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1504	$self->{layout}->set_width ($self->{max_w} || -1);	1586	$self->{layout}->set_width ($self->{max_w} || -1);
1505	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1506	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508		1590
1509	my ($w, $h) = $self->{layout}->size;	1591	my ($w, $h) = $self->{layout}->size;
1510		1592
1511	if (exists $self->{template}) {	1593	if (exists $self->{template}) {
1512	$self->{template}->set_font ($self->{font}) if $self->{font};	1594	$self->{template}->set_font ($self->{font}) if $self->{font};
1513	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514		1596
1515	my ($w2, $h2) = $self->{template}->size;	1597	my ($w2, $h2) = $self->{template}->size;
1516		1598
1517	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1518	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
		1601	}
		1602
		1603	[$w, $h]
1519	}	1604	};
1520		1605
1521	($w, $h)	1606	@{ $self->{size_req} }
1522	}	1607	}
1523		1608
1524	sub size_allocate {	1609	sub size_allocate {
1525	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1526		1611
		1612	delete $self->{ox};
		1613
1527	delete $self->{texture}	1614	delete $self->{texture}
1528	;#d#	1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1529	}	1616	}
1530		1617
1531	sub set_fontsize {	1618	sub set_fontsize {
1532	my ($self, $fontsize) = @_;	1619	my ($self, $fontsize) = @_;
1533		1620
1534	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1535	delete $self->{texture};	1622	delete $self->{texture};
1536		1623
1537	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1538	}	1633	}
1539		1634
1540	sub _draw {	1635	sub _draw {
1541	my ($self) = @_;	1636	my ($self) = @_;
1542		1637
…		…
1548	$self->{layout}->set_width ($self->{w});	1643	$self->{layout}->set_width ($self->{w});
1549	$self->{layout}->set_ellipsise ($self->{ellipsise});	1644	$self->{layout}->set_ellipsise ($self->{ellipsise});
1550	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552		1647
1553	my $tex = new_from_layout CFClient::Texture $self->{layout};	1648	new_from_layout CFClient::Texture $self->{layout}
		1649	};
1554		1650
		1651	unless (exists $self->{ox}) {
1555	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557	: ($self->{w} - $tex->{w}) * 0.5);	1654	: ($self->{w} - $tex->{w}) * 0.5);
1558		1655
1559	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1562
1563	$tex
1564	};	1659	};
1565		1660
1566	glEnable GL_TEXTURE_2D;	1661	glEnable GL_TEXTURE_2D;
1567	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1568		1662
1569	if ($tex->{format} == GL_ALPHA) {	1663	if ($tex->{format} == GL_ALPHA) {
		1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1570	glColor @{$self->{fg}};	1665	glColor @{$self->{fg}};
1571	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572	} else {	1667	} else {
		1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1573	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574	}	1670	}
1575		1671
1576	glDisable GL_TEXTURE_2D;	1672	glDisable GL_TEXTURE_2D;
1577	}	1673	}
…		…
1606		1702
1607	delete $self->{cur_h};	1703	delete $self->{cur_h};
1608		1704
1609	return if $self->{text} eq $text;	1705	return if $self->{text} eq $text;
1610		1706
1611	delete $self->{texture};
1612
1613	$self->{last_activity} = $::NOW;	1707	$self->{last_activity} = $::NOW;
1614	$self->{text} = $text;	1708	$self->{text} = $text;
1615		1709
1616	$text =~ s/./*/g if $self->{hidden};	1710	$text =~ s/./*/g if $self->{hidden};
1617	$self->{layout}->set_text ("$text ");	1711	$self->{layout}->set_text ("$text ");
		1712	delete $self->{size_req};
1618		1713
1619	$self->_emit (changed => $self->{text});	1714	$self->_emit (changed => $self->{text});
		1715
		1716	$self->realloc;
		1717	$self->update;
1620	}	1718	}
1621		1719
1622	sub set_text {	1720	sub set_text {
1623	my ($self, $text) = @_;	1721	my ($self, $text) = @_;
1624		1722
1625	$self->{cursor} = length $text;	1723	$self->{cursor} = length $text;
1626	$self->_set_text ($text);	1724	$self->_set_text ($text);
1627
1628	$self->realloc;
1629	}	1725	}
1630		1726
1631	sub get_text {	1727	sub get_text {
1632	$_[0]{text}	1728	$_[0]{text}
1633	}	1729	}
…		…
1663	$self->{cursor} = length $text;	1759	$self->{cursor} = length $text;
1664	} elsif ($uni == 27) {	1760	} elsif ($uni == 27) {
1665	$self->_emit ('escape');	1761	$self->_emit ('escape');
1666	} elsif ($uni) {	1762	} elsif ($uni) {
1667	substr $text, $self->{cursor}++, 0, chr $uni;	1763	substr $text, $self->{cursor}++, 0, chr $uni;
		1764	} else {
		1765	return 0;
1668	}	1766	}
1669		1767
1670	$self->_set_text ($text);	1768	$self->_set_text ($text);
1671		1769
1672	$self->realloc;	1770	$self->realloc;
		1771
		1772	1
1673	}	1773	}
1674		1774
1675	sub focus_in {	1775	sub focus_in {
1676	my ($self) = @_;	1776	my ($self) = @_;
1677		1777
…		…
1692	utf8::encode $text;	1792	utf8::encode $text;
1693	$self->{cursor} = length substr $text, 0, $idx;	1793	$self->{cursor} = length substr $text, 0, $idx;
1694		1794
1695	$self->_set_text ($self->{text});	1795	$self->_set_text ($self->{text});
1696	$self->update;	1796	$self->update;
		1797
		1798	1
1697	}	1799	}
1698		1800
1699	sub mouse_motion {	1801	sub mouse_motion {
1700	my ($self, $ev, $x, $y) = @_;	1802	my ($self, $ev, $x, $y) = @_;
1701	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1803	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1804
		1805	0
1702	}	1806	}
1703		1807
1704	sub _draw {	1808	sub _draw {
1705	my ($self) = @_;	1809	my ($self) = @_;
1706		1810
1707	local $self->{fg} = $self->{fg};	1811	local $self->{fg} = $self->{fg};
1708		1812
1709	if ($FOCUS == $self) {	1813	if ($FOCUS == $self) {
1710	glColor @{$self->{active_bg}};	1814	glColor_premultiply @{$self->{active_bg}};
1711	$self->{fg} = $self->{active_fg};	1815	$self->{fg} = $self->{active_fg};
1712	} else {	1816	} else {
1713	glColor @{$self->{bg}};	1817	glColor_premultiply @{$self->{bg}};
1714	}	1818	}
1715		1819
1716	glEnable GL_BLEND;	1820	glEnable GL_BLEND;
1717	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1821	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718	glBegin GL_QUADS;	1822	glBegin GL_QUADS;
1719	glVertex 0 , 0;	1823	glVertex 0 , 0;
1720	glVertex 0 , $self->{h};	1824	glVertex 0 , $self->{h};
1721	glVertex $self->{w}, $self->{h};	1825	glVertex $self->{w}, $self->{h};
1722	glVertex $self->{w}, 0;	1826	glVertex $self->{w}, 0;
…		…
1783	} else {	1887	} else {
1784	$self->set_text ($self->{history_saveback});	1888	$self->set_text ($self->{history_saveback});
1785	}	1889	}
1786		1890
1787	} else {	1891	} else {
1788	$self->SUPER::key_down ($ev);	1892	return $self->SUPER::key_down ($ev)
		1893	}
		1894
1789	}	1895	1
1790
1791	}	1896	}
1792		1897
1793	#############################################################################	1898	#############################################################################
1794		1899
1795	package CFClient::UI::Button;	1900	package CFClient::UI::Button;
…		…
1824	my ($self, $ev, $x, $y) = @_;	1929	my ($self, $ev, $x, $y) = @_;
1825		1930
1826	$self->emit ("activate")	1931	$self->emit ("activate")
1827	if $x >= 0 && $x < $self->{w}	1932	if $x >= 0 && $x < $self->{w}
1828	&& $y >= 0 && $y < $self->{h};	1933	&& $y >= 0 && $y < $self->{h};
		1934
		1935	1
1829	}	1936	}
1830		1937
1831	sub _draw {	1938	sub _draw {
1832	my ($self) = @_;	1939	my ($self) = @_;
1833		1940
1834	local $self->{fg} = $self->{fg};	1941	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836	if ($GRAB == $self) {
1837	$self->{fg} = $self->{active_fg};
1838	}
1839		1942
1840	glEnable GL_TEXTURE_2D;	1943	glEnable GL_TEXTURE_2D;
1841	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1944	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842	glColor 0, 0, 0, 1;	1945	glColor 0, 0, 0, 1;
1843		1946
…		…
1887		1990
1888	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1991	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1992	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890	$self->{state} = !$self->{state};	1993	$self->{state} = !$self->{state};
1891	$self->_emit (changed => $self->{state});	1994	$self->_emit (changed => $self->{state});
		1995	} else {
		1996	return 0
		1997	}
		1998
1892	}	1999	1
1893	}	2000	}
1894		2001
1895	sub _draw {	2002	sub _draw {
1896	my ($self) = @_;	2003	my ($self) = @_;
1897		2004
…		…
2064		2171
2065	my $h1 = $self->{h} * (1 - $ycut1);	2172	my $h1 = $self->{h} * (1 - $ycut1);
2066	my $h2 = $self->{h} * (1 - $ycut2);	2173	my $h2 = $self->{h} * (1 - $ycut2);
2067		2174
2068	glEnable GL_BLEND;	2175	glEnable GL_BLEND;
2069	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2176	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2177	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070	glEnable GL_TEXTURE_2D;	2178	glEnable GL_TEXTURE_2D;
2071	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2179	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072		2180
2073	glBindTexture GL_TEXTURE_2D, $t1->{name};	2181	glBindTexture GL_TEXTURE_2D, $t1->{name};
2074	glBegin GL_QUADS;	2182	glBegin GL_QUADS;
…		…
2235		2343
2236	$self->SUPER::button_down ($ev, $x, $y);	2344	$self->SUPER::button_down ($ev, $x, $y);
2237		2345
2238	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2346	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239		2347
2240	$self->mouse_motion ($ev, $x, $y);	2348	$self->mouse_motion ($ev, $x, $y)
2241	}	2349	}
2242		2350
2243	sub mouse_motion {	2351	sub mouse_motion {
2244	my ($self, $ev, $x, $y) = @_;	2352	my ($self, $ev, $x, $y) = @_;
2245		2353
…		…
2249	my (undef, $lo, $hi, $page) = @{$self->{range}};	2357	my (undef, $lo, $hi, $page) = @{$self->{range}};
2250		2358
2251	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2359	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252		2360
2253	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2361	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2362	} else {
		2363	return 0;
		2364	}
		2365
2254	}	2366	1
2255	}	2367	}
2256		2368
2257	sub update {	2369	sub update {
2258	my ($self) = @_;	2370	my ($self) = @_;
2259		2371
2260	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2372	delete $self->{knob_w};
		2373	$self->SUPER::update;
		2374	}
		2375
		2376	sub _draw {
		2377	my ($self) = @_;
		2378
		2379	unless ($self->{knob_w}) {
2261	$self->set_value ($self->{range}[0]);	2380	$self->set_value ($self->{range}[0]);
2262		2381
2263	my ($value, $lo, $hi, $page) = @{$self->{range}};	2382	my ($value, $lo, $hi, $page) = @{$self->{range}};
2264	my $range = ($hi - $page - $lo) || 1e-100;	2383	my $range = ($hi - $page - $lo) || 1e-100;
2265		2384
…		…
2271	$value = ($value - $lo) / $range;	2390	$value = ($value - $lo) / $range;
2272	$value = $value * $self->{scale} + $self->{offset};	2391	$value = $value * $self->{scale} + $self->{offset};
2273		2392
2274	$self->{knob_x} = $value - $knob_w * 0.5;	2393	$self->{knob_x} = $value - $knob_w * 0.5;
2275	$self->{knob_w} = $knob_w;	2394	$self->{knob_w} = $knob_w;
2276	});	2395	}
2277
2278	$self->SUPER::update;
2279	}
2280
2281	sub _draw {
2282	my ($self) = @_;
2283		2396
2284	$self->SUPER::_draw ();	2397	$self->SUPER::_draw ();
2285		2398
2286	glScale $self->{w}, $self->{h};	2399	glScale $self->{w}, $self->{h};
2287		2400
…		…
2481		2594
2482	delete $self->{texture};	2595	delete $self->{texture};
2483	}	2596	}
2484		2597
2485	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2598	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2486	glClearColor 0.5, 0.5, 0.5, 0;	2599	glClearColor 0, 0, 0, 0;
2487	glClear GL_COLOR_BUFFER_BIT;	2600	glClear GL_COLOR_BUFFER_BIT;
2488		2601
2489	my $top = int $self->{children}[1]{range}[0];	2602	my $top = int $self->{children}[1]{range}[0];
2490		2603
2491	my $y0 = $top;	2604	my $y0 = $top;
…		…
2526	sub _draw {	2639	sub _draw {
2527	my ($self) = @_;	2640	my ($self) = @_;
2528		2641
2529	glEnable GL_TEXTURE_2D;	2642	glEnable GL_TEXTURE_2D;
2530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2643	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531	glColor 1, 1, 1, 1;	2644	glColor 0, 0, 0, 1;
2532	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2645	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533	glDisable GL_TEXTURE_2D;	2646	glDisable GL_TEXTURE_2D;
2534		2647
2535	$self->{children}[1]->draw;	2648	$self->{children}[1]->draw;
2536		2649
2537	}	2650	}
…		…
2764	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2877	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765		2878
2766	if ($tex) {	2879	if ($tex) {
2767	glEnable GL_TEXTURE_2D;	2880	glEnable GL_TEXTURE_2D;
2768	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2881	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769	glColor 1, 1, 1, 1;	2882	glColor 0, 0, 0, 1;
2770	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2883	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771	glDisable GL_TEXTURE_2D;	2884	glDisable GL_TEXTURE_2D;
2772	}	2885	}
2773	}	2886	}
2774		2887
…		…
2778	$self->{timer}->cancel	2891	$self->{timer}->cancel
2779	if $self->{timer};	2892	if $self->{timer};
2780		2893
2781	$self->SUPER::DESTROY;	2894	$self->SUPER::DESTROY;
2782	}	2895	}
		2896
		2897	#############################################################################
		2898
		2899	package CFClient::UI::Buttonbar;
		2900
		2901	our @ISA = CFClient::UI::HBox::;
		2902
		2903	# TODO: should actualyl wrap buttons and other goodies.
2783		2904
2784	#############################################################################	2905	#############################################################################
2785		2906
2786	package CFClient::UI::Menu;	2907	package CFClient::UI::Menu;
2787		2908
…		…
2837	my ($self, $ev, $x, $y) = @_;	2958	my ($self, $ev, $x, $y) = @_;
2838		2959
2839	# TODO: should use vbox->find_widget or so	2960	# TODO: should use vbox->find_widget or so
2840	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2961	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841	$self->{hover} = $self->{item}{$HOVER};	2962	$self->{hover} = $self->{item}{$HOVER};
		2963
		2964	0
2842	}	2965	}
2843		2966
2844	sub button_up {	2967	sub button_up {
2845	my ($self, $ev, $x, $y) = @_;	2968	my ($self, $ev, $x, $y) = @_;
2846		2969
…		…
2848	undef $GRAB;	2971	undef $GRAB;
2849	$self->hide;	2972	$self->hide;
2850		2973
2851	$self->_emit ("popdown");	2974	$self->_emit ("popdown");
2852	$self->{hover}[1]->() if $self->{hover};	2975	$self->{hover}[1]->() if $self->{hover};
		2976	} else {
		2977	return 0
		2978	}
		2979
2853	}	2980	1
2854	}	2981	}
2855		2982
2856	#############################################################################	2983	#############################################################################
2857		2984
2858	package CFClient::UI::Statusbox;	2985	package CFClient::UI::Multiplexer;
2859		2986
2860	our @ISA = CFClient::UI::VBox::;	2987	our @ISA = CFClient::UI::Container::;
2861		2988
2862	sub new {	2989	sub new {
2863	my $class = shift;	2990	my $class = shift;
2864		2991
2865	$class->SUPER::new (	2992	my $self = $class->SUPER::new (
		2993	@_,
		2994	);
		2995
		2996	$self->{current} = $self->{children}[0]
		2997	if @{ $self->{children} };
		2998
		2999	$self
		3000	}
		3001
		3002	sub add {
		3003	my ($self, @widgets) = @_;
		3004
		3005	$self->SUPER::add (@widgets);
		3006
		3007	$self->{current} = $self->{children}[0]
		3008	if @{ $self->{children} };
		3009	}
		3010
		3011	sub set_current_page {
		3012	my ($self, $page_or_widget) = @_;
		3013
		3014	my $widget = ref $page_or_widget
		3015	? $page_or_widget
		3016	: $self->{children}[$page_or_widget];
		3017
		3018	$self->{current} = $widget;
		3019	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3020
		3021	$self->_emit (page_changed => $self->{current});
		3022
		3023	$self->realloc;
		3024	}
		3025
		3026	sub visible_children {
		3027	$_[0]{current}
		3028	}
		3029
		3030	sub size_request {
		3031	my ($self) = @_;
		3032
		3033	$self->{current}->size_request
		3034	}
		3035
		3036	sub size_allocate {
		3037	my ($self, $w, $h) = @_;
		3038
		3039	$self->{current}->configure (0, 0, $w, $h);
		3040	}
		3041
		3042	sub _draw {
		3043	my ($self) = @_;
		3044
		3045	$self->{current}->draw;
		3046	}
		3047
		3048	#############################################################################
		3049
		3050	package CFClient::UI::Notebook;
		3051
		3052	our @ISA = CFClient::UI::VBox::;
		3053
		3054	sub new {
		3055	my $class = shift;
		3056
		3057	my $self = $class->SUPER::new (
		3058	buttonbar => (new CFClient::UI::Buttonbar),
		3059	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3060	# filter => # will be put between multiplexer and $self
		3061	@_,
		3062	);
		3063
		3064	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3065	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3066
		3067	$self
		3068	}
		3069
		3070	sub add {
		3071	my ($self, $title, $widget, $tooltip) = @_;
		3072
		3073	Scalar::Util::weaken $self;
		3074
		3075	$self->{buttonbar}->add (new CFClient::UI::Button
		3076	markup => $title,
		3077	tooltip => $tooltip,
		3078	on_activate => sub { $self->set_current_page ($widget) },
		3079	);
		3080
		3081	$self->{multiplexer}->add ($widget);
		3082	}
		3083
		3084	sub set_current_page {
		3085	my ($self, $page) = @_;
		3086
		3087	$self->{multiplexer}->set_current_page ($page);
		3088	$self->_emit (page_changed => $self->{multiplexer}{current});
		3089	}
		3090
		3091	#############################################################################
		3092
		3093	package CFClient::UI::Statusbox;
		3094
		3095	our @ISA = CFClient::UI::VBox::;
		3096
		3097	sub new {
		3098	my $class = shift;
		3099
		3100	my $self = $class->SUPER::new (
2866	fontsize => 0.8,	3101	fontsize => 0.8,
2867	@_,	3102	@_,
2868	)	3103	);
		3104
		3105	Scalar::Util::weaken (my $this = $self);
		3106
		3107	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3108
		3109	$self
2869	}	3110	}
2870		3111
2871	sub reorder {	3112	sub reorder {
2872	my ($self) = @_;	3113	my ($self) = @_;
2873	my $NOW = time;	3114	my $NOW = Time::HiRes::time;
		3115
		3116	# freeze display when hovering over any label
		3117	return if $CFClient::UI::TOOLTIP->{owner}
		3118	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3119	values %{ $self->{item} };
2874		3120
2875	while (my ($k, $v) = each %{ $self->{item} }) {	3121	while (my ($k, $v) = each %{ $self->{item} }) {
2876	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3122	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877	}	3123	}
2878		3124
…		…
2881	my @items = sort {	3127	my @items = sort {
2882	$a->{pri} <=> $b->{pri}	3128	$a->{pri} <=> $b->{pri}
2883	or $b->{id} <=> $a->{id}	3129	or $b->{id} <=> $a->{id}
2884	} values %{ $self->{item} };	3130	} values %{ $self->{item} };
2885		3131
		3132	$self->{timer}->interval (1);
		3133
2886	my $count = 10 + 1;	3134	my $count = 10 + 1;
2887	for my $item (@items) {	3135	for my $item (@items) {
2888	last unless --$count;	3136	last unless --$count;
2889		3137
2890	push @widgets, $item->{label} ||= do {	3138	my $label = $item->{label} ||= do {
2891	# TODO: doesn't handle markup well (read as: at all)	3139	# TODO: doesn't handle markup well (read as: at all)
2892	my $short = $item->{count} > 1	3140	my $short = $item->{count} > 1
2893	? "<b>$item->{count} ×</b> $item->{text}"	3141	? "<b>$item->{count} ×</b> $item->{text}"
2894	: $item->{text};	3142	: $item->{text};
2895		3143
…		…
2903	tooltip => $item->{tooltip},	3151	tooltip => $item->{tooltip},
2904	tooltip_font => $::FONT_PROP,	3152	tooltip_font => $::FONT_PROP,
2905	tooltip_width => 0.67,	3153	tooltip_width => 0.67,
2906	fontsize => $item->{fontsize} || $self->{fontsize},	3154	fontsize => $item->{fontsize} || $self->{fontsize},
2907	max_w => $::WIDTH * 0.44,	3155	max_w => $::WIDTH * 0.44,
2908	fg => $item->{fg},	3156	fg => [@{ $item->{fg} }],
2909	can_events => 1,	3157	can_events => 1,
2910	can_hover => 1	3158	can_hover => 1
2911	};	3159	};
		3160
		3161	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3162	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3163	$label->update;
		3164	$label->set_max_size (undef, $label->{req_h} * $diff)
		3165	if $diff < 1;
		3166	$self->{timer}->interval (1/30);
		3167	} else {
		3168	$label->{fg}[3] = $item->{fg}[3] || 1;
		3169	}
		3170
		3171	push @widgets, $label;
2912	}	3172	}
2913		3173
2914	$self->clear;	3174	$self->clear;
2915	$self->SUPER::add (reverse @widgets);	3175	$self->SUPER::add (reverse @widgets);
2916	}	3176	}
…		…
2921	$text =~ s/^\s+//;	3181	$text =~ s/^\s+//;
2922	$text =~ s/\s+$//;	3182	$text =~ s/\s+$//;
2923		3183
2924	return unless $text;	3184	return unless $text;
2925		3185
2926	my $timeout = time + ((delete $arg{timeout}) || 60);	3186	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2927		3187
2928	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3188	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929		3189
2930	if (my $item = $self->{item}{$group}) {	3190	if (my $item = $self->{item}{$group}) {
2931	if ($item->{text} eq $text) {	3191	if ($item->{text} eq $text) {
…		…
2961		3221
2962	$self->reorder;	3222	$self->reorder;
2963	$self->SUPER::reconfigure;	3223	$self->SUPER::reconfigure;
2964	}	3224	}
2965		3225
		3226	sub DESTROY {
		3227	my ($self) = @_;
		3228
		3229	$self->{timer}->cancel;
		3230
		3231	$self->SUPER::DESTROY;
		3232	}
		3233
2966	#############################################################################	3234	#############################################################################
2967		3235
2968	package CFClient::UI::Inventory;	3236	package CFClient::UI::Inventory;
2969		3237
2970	our @ISA = CFClient::UI::ScrolledWindow::;	3238	our @ISA = CFClient::UI::ScrolledWindow::;
2971		3239
2972	sub new {	3240	sub new {
2973	my $class = shift;	3241	my $class = shift;
2974		3242
2975	my $self = $class->SUPER::new (	3243	my $self = $class->SUPER::new (
2976	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3244	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977	@_,	3245	@_,
2978	);	3246	);
2979		3247
2980	$self	3248	$self
2981	}	3249	}
2982		3250
2983	sub set_items {	3251	sub set_items {
2984	my ($self, $items) = @_;	3252	my ($self, $items) = @_;
2985		3253
2986	$self->{scrolled}->clear;	3254	$self->{child}->clear;
2987	return unless $items;	3255	return unless $items;
2988		3256
2989	my @items = sort {	3257	my @items = sort {
2990	($a->{type} <=> $b->{type})	3258	($a->{type} <=> $b->{type})
2991	or ($a->{name} cmp $b->{name})	3259	or ($a->{name} cmp $b->{name})
…		…
2995		3263
2996	my $row = 0;	3264	my $row = 0;
2997	for my $item (@items) {	3265	for my $item (@items) {
2998	CFClient::Item::update_widgets $item;	3266	CFClient::Item::update_widgets $item;
2999		3267
3000	$self->{scrolled}->add (0, $row, $item->{face_widget});	3268	$self->{child}->add (0, $row, $item->{face_widget});
3001	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3269	$self->{child}->add (1, $row, $item->{desc_widget});
3002	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3270	$self->{child}->add (2, $row, $item->{weight_widget});
3003		3271
3004	$row++;	3272	$row++;
3005	}	3273	}
3006	}	3274	}
3007		3275
…		…
3105	$rec = $::CONN->stop_record if $::CONN;	3373	$rec = $::CONN->stop_record if $::CONN;
3106	return unless ref $rec eq 'ARRAY';	3374	return unless ref $rec eq 'ARRAY';
3107	$self->set_command_list ($rec);	3375	$self->set_command_list ($rec);
3108	}	3376	}
3109		3377
3110	# if $commit is true, the binding will be set after the user entered a key combo	3378
		3379	sub ask_for_bind_and_commit {
		3380	my ($self) = @_;
		3381	$self->ask_for_bind (1);
		3382	}
		3383
3111	sub ask_for_bind {	3384	sub ask_for_bind {
3112	my ($self, $commit) = @_;	3385	my ($self, $commit) = @_;
3113		3386
3114	CFClient::Binder::open_binding_dialog (sub {	3387	CFClient::Binder::open_binding_dialog (sub {
3115	my ($mod, $sym) = @_;	3388	my ($mod, $sym) = @_;
…		…
3199		3472
3200	#############################################################################	3473	#############################################################################
3201		3474
3202	package CFClient::UI::SpellList;	3475	package CFClient::UI::SpellList;
3203		3476
3204	our @ISA = CFClient::UI::FancyFrame::;	3477	our @ISA = CFClient::UI::Table::;
3205		3478
3206	sub new {	3479	sub new {
3207	my $class = shift;	3480	my $class = shift;
3208		3481
3209	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3482	my $self = $class->SUPER::new (
3210		3483	binding => [],
3211	$self->add (new CFClient::UI::ScrolledWindow	3484	commands => [],
3212	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3485	@_,
3213		3486	)
3214	$self;
3215	}	3487	}
3216		3488
3217	# XXX: Do sorting? Argl...	3489	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3490	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
		3491	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3492	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
		3493	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3494	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
		3495
		3496	sub rebuild_spell_list {
		3497	my ($self) = @_;
		3498
		3499	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3500	$self->clear;
		3501
		3502	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
		3503	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3504	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3505	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3506
		3507	my $row = 0;
		3508
		3509	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3510	my $spell = $self->{spell}{$_};
		3511
		3512	$row++;
		3513
		3514	$self->add (0, $row, new CFClient::UI::Face
		3515	face => $spell->{face},
		3516	can_hover => 1,
		3517	can_events => 1,
		3518	tooltip => $spell->{message},
		3519	);
		3520
		3521	$self->add (1, $row, new CFClient::UI::Label
		3522	expand => 1,
		3523	text => $spell->{name},
		3524	can_hover => 1,
		3525	can_events => 1,
		3526	tooltip => $spell->{message},
		3527	);
		3528
		3529	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3530	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3531	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3532
		3533	# TODO: should be done via popup
		3534	$self->add (5, $row, new CFClient::UI::Button
		3535	text => "bind",
		3536	tooltip => "bind spell readying (cast command) to key",
		3537	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
		3538	);
		3539	}
		3540	});
		3541	}
		3542
3218	sub add_spell {	3543	sub add_spell {
3219	my ($self, $spell) = @_;	3544	my ($self, $spell) = @_;
		3545
3220	$self->{spells}->{$spell->{name}} = $spell;	3546	$self->{spell}->{$spell->{name}} = $spell;
3221		3547	$self->rebuild_spell_list;
3222	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223	face => $spell->{face},
3224	can_hover => 1,
3225	can_events => 1,
3226	tooltip => $spell->{message});
3227
3228	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229	text => $spell->{name},
3230	can_hover => 1,
3231	can_events => 1,
3232	tooltip => $spell->{message},
3233	expand => 1);
3234
3235	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238	expand => 1);
3239
3240	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241	text => "bind to key",
3242	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243	}
3244
3245	sub rebuild_spell_list {
3246	my ($self) = @_;
3247	$self->{tbl_idx} = 0;
3248	$self->add_spell ($_) for values %{$self->{spells}};
3249	}	3548	}
3250		3549
3251	sub remove_spell {	3550	sub remove_spell {
3252	my ($self, $spell) = @_;	3551	my ($self, $spell) = @_;
		3552
3253	delete $self->{spells}->{$spell->{name}};	3553	delete $self->{spell}->{$spell->{name}};
3254	$self->rebuild_spell_list;	3554	$self->rebuild_spell_list;
3255	}	3555	}
3256		3556
3257	#############################################################################	3557	#############################################################################
3258		3558
3259	package CFClient::UI::Root;	3559	package CFClient::UI::Root;
3260		3560
3261	our @ISA = CFClient::UI::Container::;	3561	our @ISA = CFClient::UI::Container::;
		3562
		3563	use List::Util qw(min max);
3262		3564
3263	use CFClient::OpenGL;	3565	use CFClient::OpenGL;
3264		3566
3265	sub new {	3567	sub new {
3266	my $class = shift;	3568	my $class = shift;
…		…
3372	$_->()	3674	$_->()
3373	for values %{delete $self->{refresh_hook}};	3675	for values %{delete $self->{refresh_hook}};
3374	}	3676	}
3375		3677
3376	if ($self->{realloc}) {	3678	if ($self->{realloc}) {
		3679	my %queue;
3377	my @queue;	3680	my @queue;
		3681	my $widget;
3378		3682
		3683	outer:
3379	while () {	3684	while () {
3380	if ($self->{realloc}) {	3685	if (my $realloc = delete $self->{realloc}) {
3381	#TODO use array-of-depth approach	3686	for $widget (values %$realloc) {
		3687	$widget->{visible} or next; # do not resize invisible widgets
3382		3688
3383	use sort 'stable';	3689	$queue{$widget+0}++ and next; # duplicates are common
3384		3690
3385	@queue = sort { $a->{visible} <=> $b->{visible} }	3691	push @{ $queue[$widget->{visible}] }, $widget;
3386	@queue, values %{delete $self->{realloc}};	3692	}
3387	}	3693	}
3388		3694
		3695	while () {
		3696	@queue or last outer;
		3697
3389	my $widget = pop @queue || last;	3698	$widget = pop @{ $queue[-1] || [] }
		3699	and last;
		3700
		3701	pop @queue;
		3702	}
3390		3703
3391	$widget->{visible} or last; # do not resize invisible widgets	3704	delete $queue{$widget+0};
3392		3705
3393	my ($w, $h) = $widget->size_request;	3706	my ($w, $h) = $widget->size_request;
3394		3707
3395	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3708	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3709	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3710
		3711	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3712	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3397		3713
3398	$w = $widget->{force_w} if exists $widget->{force_w};	3714	$w = $widget->{force_w} if exists $widget->{force_w};
3399	$h = $widget->{force_h} if exists $widget->{force_h};	3715	$h = $widget->{force_h} if exists $widget->{force_h};
3400		3716
3401	if ($widget->{req_w} != $w || $widget->{req_h} != $h	3717	if ($widget->{req_w} != $w || $widget->{req_h} != $h
…		…
3404	$widget->{req_h} = $h;	3720	$widget->{req_h} = $h;
3405		3721
3406	$self->{size_alloc}{$widget+0} = $widget;	3722	$self->{size_alloc}{$widget+0} = $widget;
3407		3723
3408	if (my $parent = $widget->{parent}) {	3724	if (my $parent = $widget->{parent}) {
3409	$self->{realloc}{$parent+0} = $parent;	3725	$self->{realloc}{$parent+0} = $parent
3410	#unshift @queue, $parent;	3726	unless $queue{$parent+0};
		3727
3411	$parent->{force_size_alloc} = 1;	3728	$parent->{force_size_alloc} = 1;
3412	$self->{size_alloc}{$parent+0} = $parent;	3729	$self->{size_alloc}{$parent+0} = $parent;
3413	}	3730	}
3414	}	3731	}
3415		3732
…		…
3431		3748
3432	$w = int $w + 0.5;	3749	$w = int $w + 0.5;
3433	$h = int $h + 0.5;	3750	$h = int $h + 0.5;
3434		3751
3435	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3752	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3753	$widget->{old_w} = $widget->{w};
		3754	$widget->{old_h} = $widget->{h};
		3755
3436	$widget->{w} = $w;	3756	$widget->{w} = $w;
3437	$widget->{h} = $h;	3757	$widget->{h} = $h;
3438		3758
3439	$widget->emit (size_allocate => $w, $h);	3759	$widget->emit (size_allocate => $w, $h);
3440	}	3760	}
…		…
3455	glLoadIdentity;	3775	glLoadIdentity;
3456	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3776	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3457	glMatrixMode GL_MODELVIEW;	3777	glMatrixMode GL_MODELVIEW;
3458	glLoadIdentity;	3778	glLoadIdentity;
3459		3779
		3780	{
		3781	package CFClient::UI::Base;
		3782
		3783	($draw_x, $draw_y, $draw_w, $draw_h) =
		3784	(0, 0, $self->{w}, $self->{h});
		3785	}
		3786
3460	$self->_draw;	3787	$self->_draw;
3461	}	3788	}
3462		3789
3463	#############################################################################	3790	#############################################################################
3464		3791

Diff Legend

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