[ViewVC] Diff of: 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.288 by root, Mon Jun 5 21:14:40 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};
…		…
521	}	526	}
522		527
523	sub reconfigure {	528	sub reconfigure {
524	my ($self) = @_;	529	my ($self) = @_;
525		530
		531	# some widgets cache req_w and req_h
		532	delete $self->{req_w};
		533	delete $self->{req_h};
		534
526	$self->realloc;	535	$self->realloc;
527	$self->update;	536	$self->update;
528	}	537	}
529		538
		539	# using global variables seems a bit hacky, but passing through all drawing
		540	# functions seems pointless.
		541	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		542
530	sub draw {	543	sub draw {
531	my ($self) = @_;	544	my ($self) = @_;
532		545
533	return unless $self->{h} && $self->{w};	546	return unless $self->{h} && $self->{w};
		547
		548	# update screen rectangle
		549	local $draw_x = $draw_x + $self->{x};
		550	local $draw_y = $draw_y + $self->{y};
		551	local $draw_w = $draw_x + $self->{w};
		552	local $draw_h = $draw_y + $self->{h};
		553
		554	# skip widgets that are entirely outside the drawing area
		555	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
		556	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
534		557
535	glPushMatrix;	558	glPushMatrix;
536	glTranslate $self->{x}, $self->{y}, 0;	559	glTranslate $self->{x}, $self->{y}, 0;
537	$self->_draw;
538	glPopMatrix;
539		560
540	if ($self == $HOVER && $self->{can_hover}) {	561	if ($self == $HOVER && $self->{can_hover}) {
541	my ($x, $y) = @$self{qw(x y)};
542
543	glColor 1, 0.8, 0.5, 0.2;	562	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
544	glEnable GL_BLEND;	563	glEnable GL_BLEND;
545	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	564	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546	glBegin GL_QUADS;	565	glBegin GL_QUADS;
547	glVertex $x , $y;	566	glVertex 0 , 0;
548	glVertex $x + $self->{w}, $y;	567	glVertex $self->{w}, 0;
549	glVertex $x + $self->{w}, $y + $self->{h};	568	glVertex $self->{w}, $self->{h};
550	glVertex $x , $y + $self->{h};	569	glVertex 0 , $self->{h};
551	glEnd;	570	glEnd;
552	glDisable GL_BLEND;	571	glDisable GL_BLEND;
553	}	572	}
554		573
555	if ($ENV{CFPLUS_DEBUG} & 1) {	574	if ($ENV{CFPLUS_DEBUG} & 1) {
556	glPushMatrix;	575	glPushMatrix;
557	glColor 1, 1, 0, 1;	576	glColor 1, 1, 0, 1;
558	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	577	glTranslate 0.375, 0.375;
559	glBegin GL_LINE_LOOP;	578	glBegin GL_LINE_LOOP;
560	glVertex 0 , 0;	579	glVertex 0 , 0;
561	glVertex $self->{w} - 1, 0;	580	glVertex $self->{w} - 1, 0;
562	glVertex $self->{w} - 1, $self->{h} - 1;	581	glVertex $self->{w} - 1, $self->{h} - 1;
563	glVertex 0 , $self->{h} - 1;	582	glVertex 0 , $self->{h} - 1;
564	glEnd;	583	glEnd;
565	glPopMatrix;	584	glPopMatrix;
566	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	585	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567	}	586	}
		587
		588	$self->_draw;
		589	glPopMatrix;
568	}	590	}
569		591
570	sub _draw {	592	sub _draw {
571	my ($self) = @_;	593	my ($self) = @_;
572		594
…		…
610		632
611	if ($color && (@$color < 4 \|\| $color->[3])) {	633	if ($color && (@$color < 4 \|\| $color->[3])) {
612	my ($w, $h) = @$self{qw(w h)};	634	my ($w, $h) = @$self{qw(w h)};
613		635
614	glEnable GL_BLEND;	636	glEnable GL_BLEND;
615	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	637	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616	glColor @$color;	638	glColor_premultiply @$color;
617		639
618	glBegin GL_QUADS;	640	glBegin GL_QUADS;
619	glVertex 0 , 0;	641	glVertex 0 , 0;
620	glVertex 0 , $h;	642	glVertex 0 , $h;
621	glVertex $w, $h;	643	glVertex $w, $h;
…		…
652	our @ISA = CFClient::UI::Base::;	674	our @ISA = CFClient::UI::Base::;
653		675
654	sub new {	676	sub new {
655	my ($class, %arg) = @_;	677	my ($class, %arg) = @_;
656		678
657	my $children = delete $arg{children} \|\| [];	679	my $children = delete $arg{children};
658		680
659	my $self = $class->SUPER::new (	681	my $self = $class->SUPER::new (
660	children => [],	682	children => [],
661	can_events => 0,	683	can_events => 0,
662	%arg,	684	%arg,
663	);	685	);
		686
664	$self->add ($_) for @$children;	687	$self->add (@$children)
		688	if $children;
665		689
666	$self	690	$self
667	}	691	}
668		692
669	sub add {	693	sub add {
…		…
717	$x -= $self->{x};	741	$x -= $self->{x};
718	$y -= $self->{y};	742	$y -= $self->{y};
719		743
720	my $res;	744	my $res;
721		745
722	for (reverse @{ $self->{children} }) {	746	for (reverse $self->visible_children) {
723	$res = $_->find_widget ($x, $y)	747	$res = $_->find_widget ($x, $y)
724	and return $res;	748	and return $res;
725	}	749	}
726		750
727	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	751	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
776	$self->{children}[0]->configure (0, 0, $w, $h);	800	$self->{children}[0]->configure (0, 0, $w, $h);
777	}	801	}
778		802
779	#############################################################################	803	#############################################################################
780		804
		805	# back-buffered drawing area
		806
781	package CFClient::UI::Window;	807	package CFClient::UI::Window;
782		808
783	our @ISA = CFClient::UI::Bin::;	809	our @ISA = CFClient::UI::Bin::;
784		810
785	use CFClient::OpenGL;	811	use CFClient::OpenGL;
…		…
803	$self->SUPER::size_allocate ($w, $h);	829	$self->SUPER::size_allocate ($w, $h);
804	$self->update;	830	$self->update;
805	}	831	}
806		832
807	sub _render {	833	sub _render {
		834	my ($self) = @_;
		835
808	$_[0]{children}[0]->draw;	836	$self->{children}[0]->draw;
809	}	837	}
810		838
811	sub render_child {	839	sub render_child {
812	my ($self) = @_;	840	my ($self) = @_;
813		841
814	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	842	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815	glClearColor 0, 0, 0, 0;	843	glClearColor 0, 0, 0, 0;
816	glClear GL_COLOR_BUFFER_BIT;	844	glClear GL_COLOR_BUFFER_BIT;
817		845
		846	{
		847	package CFClient::UI::Base;
		848
		849	($draw_x, $draw_y, $draw_w, $draw_h) =
		850	(0, 0, $self->{w}, $self->{h});
		851	}
		852
818	$self->_render;	853	$self->_render;
819	};	854	};
820	}	855	}
821		856
822	sub _draw {	857	sub _draw {
823	my ($self) = @_;	858	my ($self) = @_;
824		859
825	my ($w, $h) = ($self->w, $self->h);	860	my ($w, $h) = @$self{qw(w h)};
826		861
827	my $tex = $self->{texture}	862	my $tex = $self->{texture}
828	or return;	863	or return;
829		864
830	glEnable GL_TEXTURE_2D;	865	glEnable GL_TEXTURE_2D;
831	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	866	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832	glColor 1, 1, 1, 1;	867	glColor 0, 0, 0, 1;
833		868
834	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	869	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835		870
836	glDisable GL_TEXTURE_2D;	871	glDisable GL_TEXTURE_2D;
837	}	872	}
…		…
913	}	948	}
914		949
915	sub _render {	950	sub _render {
916	my ($self) = @_;	951	my ($self) = @_;
917		952
		953	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		954	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		955
918	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	956	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919		957
920	$self->SUPER::_render;	958	$self->SUPER::_render;
921	}	959	}
922		960
…		…
925	package CFClient::UI::ScrolledWindow;	963	package CFClient::UI::ScrolledWindow;
926		964
927	our @ISA = CFClient::UI::HBox::;	965	our @ISA = CFClient::UI::HBox::;
928		966
929	sub new {	967	sub new {
930	my $class = shift;	968	my ($class, %arg) = @_;
		969
		970	my $child = delete $arg{child};
931		971
932	my $self;	972	my $self;
933		973
934	my $slider = new CFClient::UI::Slider	974	my $slider = new CFClient::UI::Slider
935	vertical => 1,	975	vertical => 1,
…		…
940	;	980	;
941		981
942	$self = $class->SUPER::new (	982	$self = $class->SUPER::new (
943	vp => (new CFClient::UI::ViewPort expand => 1),	983	vp => (new CFClient::UI::ViewPort expand => 1),
944	slider => $slider,	984	slider => $slider,
945	@_,	985	%arg,
946	);	986	);
947		987
948	$self->{vp}->add ($self->{scrolled});
949	$self->add ($self->{vp});
950	$self->add ($self->{slider});	988	$self->SUPER::add ($self->{vp}, $self->{slider});
		989	$self->add ($child) if $child;
951		990
952	$self	991	$self
		992	}
		993
		994	sub add {
		995	my ($self, $widget) = @_;
		996
		997	$self->{vp}->add ($self->{child} = $widget);
953	}	998	}
954		999
955	sub update {	1000	sub update {
956	my ($self) = @_;	1001	my ($self) = @_;
957		1002
…		…
996		1041
997	if ($self->{bg}) {	1042	if ($self->{bg}) {
998	my ($w, $h) = @$self{qw(w h)};	1043	my ($w, $h) = @$self{qw(w h)};
999		1044
1000	glEnable GL_BLEND;	1045	glEnable GL_BLEND;
1001	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1046	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002	glColor @{ $self->{bg} };	1047	glColor_premultiply @{ $self->{bg} };
1003		1048
1004	glBegin GL_QUADS;	1049	glBegin GL_QUADS;
1005	glVertex 0 , 0;	1050	glVertex 0 , 0;
1006	glVertex 0 , $h;	1051	glVertex 0 , $h;
1007	glVertex $w, $h;	1052	glVertex $w, $h;
…		…
1029	my @border =	1074	my @border =
1030	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1075	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);	1076	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032		1077
1033	sub new {	1078	sub new {
1034	my $class = shift;	1079	my ($class, %arg) = @_;
		1080
		1081	my $title = delete $arg{title};
1035		1082
1036	my $self = $class->SUPER::new (	1083	my $self = $class->SUPER::new (
1037	bg => [1, 1, 1, 1],	1084	bg => [1, 1, 1, 1],
1038	border_bg => [1, 1, 1, 1],	1085	border_bg => [1, 1, 1, 1],
1039	border => 0.6,	1086	border => 0.6,
1040	can_events => 1,	1087	can_events => 1,
1041	min_w => 16,	1088	min_w => 16,
1042	min_h => 16,	1089	min_h => 16,
1043	@_	1090	%arg,
1044	);	1091	);
1045		1092
1046	$self->{title} &&= new CFClient::UI::Label	1093	$self->{title} = new CFClient::UI::Label
1047	align => 0,	1094	align => 0,
1048	valign => 1,	1095	valign => 1,
1049	text => $self->{title},	1096	text => $title,
1050	fontsize => $self->{border};	1097	fontsize => $self->{border}
		1098	if defined $title;
1051		1099
1052	$self	1100	$self
		1101	}
		1102
		1103	sub add {
		1104	my ($self, @widgets) = @_;
		1105
		1106	$self->SUPER::add (@widgets);
		1107	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1053	}	1108	}
1054		1109
1055	sub border {	1110	sub border {
1056	int $_[0]{border} * $::FONTSIZE	1111	int $_[0]{border} * $::FONTSIZE
1057	}	1112	}
1058		1113
1059	sub size_request {	1114	sub size_request {
1060	my ($self) = @_;	1115	my ($self) = @_;
		1116
		1117	$self->{title}->size_request
		1118	if $self->{title};
1061		1119
1062	my ($w, $h) = $self->SUPER::size_request;	1120	my ($w, $h) = $self->SUPER::size_request;
1063		1121
1064	(	1122	(
1065	$w + $self->border * 2,	1123	$w + $self->border * 2,
…		…
1068	}	1126	}
1069		1127
1070	sub size_allocate {	1128	sub size_allocate {
1071	my ($self, $w, $h) = @_;	1129	my ($self, $w, $h) = @_;
1072		1130
		1131	if ($self->{title}) {
		1132	$self->{title}{w} = $w;
		1133	$self->{title}{h} = $h;
		1134	$self->{title}->size_allocate ($w, $h);
		1135	}
		1136
		1137	my $border = $self->border;
		1138
1073	$h -= List::Util::max 0, $self->border * 2;	1139	$h -= List::Util::max 0, $border * 2;
1074	$w -= List::Util::max 0, $self->border * 2;	1140	$w -= List::Util::max 0, $border * 2;
1075		1141
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);	1142	$self->child->configure ($border, $border, $w, $h);
1080	}	1143	}
1081		1144
1082	sub button_down {	1145	sub button_down {
1083	my ($self, $ev, $x, $y) = @_;	1146	my ($self, $ev, $x, $y) = @_;
1084		1147
…		…
1103	my $dy = $ev->{y} - $oy;	1166	my $dy = $ev->{y} - $oy;
1104		1167
1105	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1168	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1169	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107		1170
		1171	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108	$self->realloc;	1172	$self->realloc;
1109	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110	};	1173	};
1111		1174
1112	} elsif ($lr ^ $td) {	1175	} elsif ($lr ^ $td) {
1113	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1176	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114	my ($bx, $by) = ($self->{x}, $self->{y});	1177	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1117	my ($ev, $x, $y) = @_;	1180	my ($ev, $x, $y) = @_;
1118		1181
1119	($x, $y) = ($ev->{x}, $ev->{y});	1182	($x, $y) = ($ev->{x}, $ev->{y});
1120		1183
1121	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1184	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1185	# HACK: the next line is required to enforce placement
		1186	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122	};	1187	};
		1188	} else {
		1189	return 0;
		1190	}
		1191
1123	}	1192	1
1124	}	1193	}
1125		1194
1126	sub button_up {	1195	sub button_up {
1127	my ($self, $ev, $x, $y) = @_;	1196	my ($self, $ev, $x, $y) = @_;
1128		1197
1129	delete $self->{motion};	1198	!!delete $self->{motion}
1130	}	1199	}
1131		1200
1132	sub mouse_motion {	1201	sub mouse_motion {
1133	my ($self, $ev, $x, $y) = @_;	1202	my ($self, $ev, $x, $y) = @_;
1134		1203
1135	$self->{motion}->($ev, $x, $y) if $self->{motion};	1204	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1205
		1206	!!$self->{motion}
1136	}	1207	}
1137		1208
1138	sub _draw {	1209	sub _draw {
1139	my ($self) = @_;	1210	my ($self) = @_;
1140		1211
		1212	my $child = $self->{children}[0];
		1213
1141	my ($w, $h ) = ($self->{w}, $self->{h});	1214	my ($w, $h ) = ($self->{w}, $self->{h});
1142	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1215	my ($cw, $ch) = ($child->{w}, $child->{h});
1143		1216
1144	glEnable GL_TEXTURE_2D;	1217	glEnable GL_TEXTURE_2D;
1145	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1218	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146		1219
1147	my $border = $self->border;	1220	my $border = $self->border;
…		…
1162	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1235	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163	}	1236	}
1164		1237
1165	glDisable GL_TEXTURE_2D;	1238	glDisable GL_TEXTURE_2D;
1166		1239
1167	$self->{title}->draw if $self->{title};
1168
1169	$self->child->draw;	1240	$child->draw;
		1241
		1242	if ($self->{title}) {
		1243	glTranslate 0, $border - $self->{h};
		1244	$self->{title}->_draw;
		1245	}
1170	}	1246	}
1171		1247
1172	#############################################################################	1248	#############################################################################
1173		1249
1174	package CFClient::UI::Table;	1250	package CFClient::UI::Table;
…		…
1467		1543
1468	delete $self->{texture};	1544	delete $self->{texture};
1469	$self->SUPER::update;	1545	$self->SUPER::update;
1470	}	1546	}
1471		1547
		1548	sub realloc {
		1549	my ($self) = @_;
		1550
		1551	delete $self->{ox};
		1552	$self->SUPER::realloc;
		1553	}
		1554
1472	sub set_text {	1555	sub set_text {
1473	my ($self, $text) = @_;	1556	my ($self, $text) = @_;
1474		1557
1475	return if $self->{text} eq "T$text";	1558	return if $self->{text} eq "T$text";
1476	$self->{text} = "T$text";	1559	$self->{text} = "T$text";
1477		1560
1478	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1561	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479	$self->{layout}->set_text ($text);	1562	$self->{layout}->set_text ($text);
1480		1563
		1564	delete $self->{req_h};
1481	$self->realloc;	1565	$self->realloc;
1482	$self->update;	1566	$self->update;
1483	}	1567	}
1484		1568
1485	sub set_markup {	1569	sub set_markup {
…		…
1491	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1575	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1492		1576
1493	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1577	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494	$self->{layout}->set_markup ($markup);	1578	$self->{layout}->set_markup ($markup);
1495		1579
		1580	delete $self->{req_h};
1496	$self->realloc;	1581	$self->realloc;
1497	$self->update;	1582	$self->update;
1498	}	1583	}
1499		1584
1500	sub size_request {	1585	sub size_request {
1501	my ($self) = @_;	1586	my ($self) = @_;
1502		1587
		1588	if (exists $self->{req_h}) {
		1589	@$self{qw(req_w req_h)}
		1590	} else {
1503	$self->{layout}->set_font ($self->{font}) if $self->{font};	1591	$self->{layout}->set_font ($self->{font}) if $self->{font};
1504	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1592	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1505	$self->{layout}->set_ellipsise ($self->{ellipsise});	1593	$self->{layout}->set_ellipsise ($self->{ellipsise});
1506	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1594	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508		1596
1509	my ($w, $h) = $self->{layout}->size;	1597	my ($w, $h) = $self->{layout}->size;
1510		1598
1511	if (exists $self->{template}) {	1599	if (exists $self->{template}) {
1512	$self->{template}->set_font ($self->{font}) if $self->{font};	1600	$self->{template}->set_font ($self->{font}) if $self->{font};
1513	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1601	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514		1602
1515	my ($w2, $h2) = $self->{template}->size;	1603	my ($w2, $h2) = $self->{template}->size;
1516		1604
1517	$w = List::Util::max $w, $w2;	1605	$w = List::Util::max $w, $w2;
1518	$h = List::Util::max $h, $h2;	1606	$h = List::Util::max $h, $h2;
1519	}	1607	}
1520		1608
1521	($w, $h)	1609	($w, $h)
		1610	}
1522	}	1611	}
1523		1612
1524	sub size_allocate {	1613	sub size_allocate {
1525	my ($self, $w, $h) = @_;	1614	my ($self, $w, $h) = @_;
1526		1615
		1616	delete $self->{ox};
		1617
1527	delete $self->{texture}	1618	delete $self->{texture}
1528	;#d#	1619	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1529	}	1620	}
1530		1621
1531	sub set_fontsize {	1622	sub set_fontsize {
1532	my ($self, $fontsize) = @_;	1623	my ($self, $fontsize) = @_;
1533		1624
…		…
1548	$self->{layout}->set_width ($self->{w});	1639	$self->{layout}->set_width ($self->{w});
1549	$self->{layout}->set_ellipsise ($self->{ellipsise});	1640	$self->{layout}->set_ellipsise ($self->{ellipsise});
1550	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1641	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1642	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552		1643
1553	my $tex = new_from_layout CFClient::Texture $self->{layout};	1644	new_from_layout CFClient::Texture $self->{layout}
		1645	};
1554		1646
		1647	unless (exists $self->{ox}) {
1555	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1648	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1649	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557	: ($self->{w} - $tex->{w}) * 0.5);	1650	: ($self->{w} - $tex->{w}) * 0.5);
1558		1651
1559	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1652	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1653	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561	: ($self->{h} - $tex->{h}) * 0.5);	1654	: ($self->{h} - $tex->{h}) * 0.5);
1562
1563	$tex
1564	};	1655	};
1565		1656
1566	glEnable GL_TEXTURE_2D;	1657	glEnable GL_TEXTURE_2D;
1567	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1568		1658
1569	if ($tex->{format} == GL_ALPHA) {	1659	if ($tex->{format} == GL_ALPHA) {
		1660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1570	glColor @{$self->{fg}};	1661	glColor @{$self->{fg}};
1571	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1662	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572	} else {	1663	} else {
		1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1573	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1665	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574	}	1666	}
1575		1667
1576	glDisable GL_TEXTURE_2D;	1668	glDisable GL_TEXTURE_2D;
1577	}	1669	}
…		…
1606		1698
1607	delete $self->{cur_h};	1699	delete $self->{cur_h};
1608		1700
1609	return if $self->{text} eq $text;	1701	return if $self->{text} eq $text;
1610		1702
1611	delete $self->{texture};
1612
1613	$self->{last_activity} = $::NOW;	1703	$self->{last_activity} = $::NOW;
1614	$self->{text} = $text;	1704	$self->{text} = $text;
1615		1705
1616	$text =~ s/./*/g if $self->{hidden};	1706	$text =~ s/./*/g if $self->{hidden};
1617	$self->{layout}->set_text ("$text ");	1707	$self->{layout}->set_text ("$text ");
		1708	delete $self->{req_h};
1618		1709
1619	$self->_emit (changed => $self->{text});	1710	$self->_emit (changed => $self->{text});
		1711
		1712	$self->realloc;
		1713	$self->update;
1620	}	1714	}
1621		1715
1622	sub set_text {	1716	sub set_text {
1623	my ($self, $text) = @_;	1717	my ($self, $text) = @_;
1624		1718
1625	$self->{cursor} = length $text;	1719	$self->{cursor} = length $text;
1626	$self->_set_text ($text);	1720	$self->_set_text ($text);
1627
1628	$self->realloc;
1629	}	1721	}
1630		1722
1631	sub get_text {	1723	sub get_text {
1632	$_[0]{text}	1724	$_[0]{text}
1633	}	1725	}
…		…
1663	$self->{cursor} = length $text;	1755	$self->{cursor} = length $text;
1664	} elsif ($uni == 27) {	1756	} elsif ($uni == 27) {
1665	$self->_emit ('escape');	1757	$self->_emit ('escape');
1666	} elsif ($uni) {	1758	} elsif ($uni) {
1667	substr $text, $self->{cursor}++, 0, chr $uni;	1759	substr $text, $self->{cursor}++, 0, chr $uni;
		1760	} else {
		1761	return 0;
1668	}	1762	}
1669		1763
1670	$self->_set_text ($text);	1764	$self->_set_text ($text);
1671		1765
1672	$self->realloc;	1766	$self->realloc;
		1767
		1768	1
1673	}	1769	}
1674		1770
1675	sub focus_in {	1771	sub focus_in {
1676	my ($self) = @_;	1772	my ($self) = @_;
1677		1773
…		…
1692	utf8::encode $text;	1788	utf8::encode $text;
1693	$self->{cursor} = length substr $text, 0, $idx;	1789	$self->{cursor} = length substr $text, 0, $idx;
1694		1790
1695	$self->_set_text ($self->{text});	1791	$self->_set_text ($self->{text});
1696	$self->update;	1792	$self->update;
		1793
		1794	1
1697	}	1795	}
1698		1796
1699	sub mouse_motion {	1797	sub mouse_motion {
1700	my ($self, $ev, $x, $y) = @_;	1798	my ($self, $ev, $x, $y) = @_;
1701	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1799	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1800
		1801	0
1702	}	1802	}
1703		1803
1704	sub _draw {	1804	sub _draw {
1705	my ($self) = @_;	1805	my ($self) = @_;
1706		1806
1707	local $self->{fg} = $self->{fg};	1807	local $self->{fg} = $self->{fg};
1708		1808
1709	if ($FOCUS == $self) {	1809	if ($FOCUS == $self) {
1710	glColor @{$self->{active_bg}};	1810	glColor_premultiply @{$self->{active_bg}};
1711	$self->{fg} = $self->{active_fg};	1811	$self->{fg} = $self->{active_fg};
1712	} else {	1812	} else {
1713	glColor @{$self->{bg}};	1813	glColor_premultiply @{$self->{bg}};
1714	}	1814	}
1715		1815
1716	glEnable GL_BLEND;	1816	glEnable GL_BLEND;
1717	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1817	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718	glBegin GL_QUADS;	1818	glBegin GL_QUADS;
1719	glVertex 0 , 0;	1819	glVertex 0 , 0;
1720	glVertex 0 , $self->{h};	1820	glVertex 0 , $self->{h};
1721	glVertex $self->{w}, $self->{h};	1821	glVertex $self->{w}, $self->{h};
1722	glVertex $self->{w}, 0;	1822	glVertex $self->{w}, 0;
…		…
1783	} else {	1883	} else {
1784	$self->set_text ($self->{history_saveback});	1884	$self->set_text ($self->{history_saveback});
1785	}	1885	}
1786		1886
1787	} else {	1887	} else {
1788	$self->SUPER::key_down ($ev);	1888	return $self->SUPER::key_down ($ev)
		1889	}
		1890
1789	}	1891	1
1790
1791	}	1892	}
1792		1893
1793	#############################################################################	1894	#############################################################################
1794		1895
1795	package CFClient::UI::Button;	1896	package CFClient::UI::Button;
…		…
1824	my ($self, $ev, $x, $y) = @_;	1925	my ($self, $ev, $x, $y) = @_;
1825		1926
1826	$self->emit ("activate")	1927	$self->emit ("activate")
1827	if $x >= 0 && $x < $self->{w}	1928	if $x >= 0 && $x < $self->{w}
1828	&& $y >= 0 && $y < $self->{h};	1929	&& $y >= 0 && $y < $self->{h};
		1930
		1931	1
1829	}	1932	}
1830		1933
1831	sub _draw {	1934	sub _draw {
1832	my ($self) = @_;	1935	my ($self) = @_;
1833		1936
1834	local $self->{fg} = $self->{fg};	1937	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836	if ($GRAB == $self) {
1837	$self->{fg} = $self->{active_fg};
1838	}
1839		1938
1840	glEnable GL_TEXTURE_2D;	1939	glEnable GL_TEXTURE_2D;
1841	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1940	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842	glColor 0, 0, 0, 1;	1941	glColor 0, 0, 0, 1;
1843		1942
…		…
1887		1986
1888	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1987	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1988	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890	$self->{state} = !$self->{state};	1989	$self->{state} = !$self->{state};
1891	$self->_emit (changed => $self->{state});	1990	$self->_emit (changed => $self->{state});
		1991	} else {
		1992	return 0
		1993	}
		1994
1892	}	1995	1
1893	}	1996	}
1894		1997
1895	sub _draw {	1998	sub _draw {
1896	my ($self) = @_;	1999	my ($self) = @_;
1897		2000
…		…
2064		2167
2065	my $h1 = $self->{h} * (1 - $ycut1);	2168	my $h1 = $self->{h} * (1 - $ycut1);
2066	my $h2 = $self->{h} * (1 - $ycut2);	2169	my $h2 = $self->{h} * (1 - $ycut2);
2067		2170
2068	glEnable GL_BLEND;	2171	glEnable GL_BLEND;
2069	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2172	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2173	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070	glEnable GL_TEXTURE_2D;	2174	glEnable GL_TEXTURE_2D;
2071	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2175	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072		2176
2073	glBindTexture GL_TEXTURE_2D, $t1->{name};	2177	glBindTexture GL_TEXTURE_2D, $t1->{name};
2074	glBegin GL_QUADS;	2178	glBegin GL_QUADS;
…		…
2235		2339
2236	$self->SUPER::button_down ($ev, $x, $y);	2340	$self->SUPER::button_down ($ev, $x, $y);
2237		2341
2238	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2342	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239		2343
2240	$self->mouse_motion ($ev, $x, $y);	2344	$self->mouse_motion ($ev, $x, $y)
2241	}	2345	}
2242		2346
2243	sub mouse_motion {	2347	sub mouse_motion {
2244	my ($self, $ev, $x, $y) = @_;	2348	my ($self, $ev, $x, $y) = @_;
2245		2349
…		…
2249	my (undef, $lo, $hi, $page) = @{$self->{range}};	2353	my (undef, $lo, $hi, $page) = @{$self->{range}};
2250		2354
2251	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2355	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252		2356
2253	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2357	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2358	} else {
		2359	return 0;
		2360	}
		2361
2254	}	2362	1
2255	}	2363	}
2256		2364
2257	sub update {	2365	sub update {
2258	my ($self) = @_;	2366	my ($self) = @_;
2259		2367
2260	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2368	delete $self->{knob_w};
		2369	$self->SUPER::update;
		2370	}
		2371
		2372	sub _draw {
		2373	my ($self) = @_;
		2374
		2375	unless ($self->{knob_w}) {
2261	$self->set_value ($self->{range}[0]);	2376	$self->set_value ($self->{range}[0]);
2262		2377
2263	my ($value, $lo, $hi, $page) = @{$self->{range}};	2378	my ($value, $lo, $hi, $page) = @{$self->{range}};
2264	my $range = ($hi - $page - $lo) \|\| 1e-100;	2379	my $range = ($hi - $page - $lo) \|\| 1e-100;
2265		2380
…		…
2271	$value = ($value - $lo) / $range;	2386	$value = ($value - $lo) / $range;
2272	$value = $value * $self->{scale} + $self->{offset};	2387	$value = $value * $self->{scale} + $self->{offset};
2273		2388
2274	$self->{knob_x} = $value - $knob_w * 0.5;	2389	$self->{knob_x} = $value - $knob_w * 0.5;
2275	$self->{knob_w} = $knob_w;	2390	$self->{knob_w} = $knob_w;
2276	});	2391	}
2277
2278	$self->SUPER::update;
2279	}
2280
2281	sub _draw {
2282	my ($self) = @_;
2283		2392
2284	$self->SUPER::_draw ();	2393	$self->SUPER::_draw ();
2285		2394
2286	glScale $self->{w}, $self->{h};	2395	glScale $self->{w}, $self->{h};
2287		2396
…		…
2481		2590
2482	delete $self->{texture};	2591	delete $self->{texture};
2483	}	2592	}
2484		2593
2485	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2594	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2486	glClearColor 0.5, 0.5, 0.5, 0;	2595	glClearColor 0, 0, 0, 0;
2487	glClear GL_COLOR_BUFFER_BIT;	2596	glClear GL_COLOR_BUFFER_BIT;
2488		2597
2489	my $top = int $self->{children}[1]{range}[0];	2598	my $top = int $self->{children}[1]{range}[0];
2490		2599
2491	my $y0 = $top;	2600	my $y0 = $top;
…		…
2526	sub _draw {	2635	sub _draw {
2527	my ($self) = @_;	2636	my ($self) = @_;
2528		2637
2529	glEnable GL_TEXTURE_2D;	2638	glEnable GL_TEXTURE_2D;
2530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2639	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531	glColor 1, 1, 1, 1;	2640	glColor 0, 0, 0, 1;
2532	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2641	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533	glDisable GL_TEXTURE_2D;	2642	glDisable GL_TEXTURE_2D;
2534		2643
2535	$self->{children}[1]->draw;	2644	$self->{children}[1]->draw;
2536		2645
2537	}	2646	}
…		…
2764	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2873	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2765		2874
2766	if ($tex) {	2875	if ($tex) {
2767	glEnable GL_TEXTURE_2D;	2876	glEnable GL_TEXTURE_2D;
2768	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2877	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769	glColor 1, 1, 1, 1;	2878	glColor 0, 0, 0, 1;
2770	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2879	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771	glDisable GL_TEXTURE_2D;	2880	glDisable GL_TEXTURE_2D;
2772	}	2881	}
2773	}	2882	}
2774		2883
…		…
2778	$self->{timer}->cancel	2887	$self->{timer}->cancel
2779	if $self->{timer};	2888	if $self->{timer};
2780		2889
2781	$self->SUPER::DESTROY;	2890	$self->SUPER::DESTROY;
2782	}	2891	}
		2892
		2893	#############################################################################
		2894
		2895	package CFClient::UI::Buttonbar;
		2896
		2897	our @ISA = CFClient::UI::HBox::;
		2898
		2899	# TODO: should actualyl wrap buttons and other goodies.
2783		2900
2784	#############################################################################	2901	#############################################################################
2785		2902
2786	package CFClient::UI::Menu;	2903	package CFClient::UI::Menu;
2787		2904
…		…
2837	my ($self, $ev, $x, $y) = @_;	2954	my ($self, $ev, $x, $y) = @_;
2838		2955
2839	# TODO: should use vbox->find_widget or so	2956	# TODO: should use vbox->find_widget or so
2840	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2957	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841	$self->{hover} = $self->{item}{$HOVER};	2958	$self->{hover} = $self->{item}{$HOVER};
		2959
		2960	0
2842	}	2961	}
2843		2962
2844	sub button_up {	2963	sub button_up {
2845	my ($self, $ev, $x, $y) = @_;	2964	my ($self, $ev, $x, $y) = @_;
2846		2965
…		…
2848	undef $GRAB;	2967	undef $GRAB;
2849	$self->hide;	2968	$self->hide;
2850		2969
2851	$self->_emit ("popdown");	2970	$self->_emit ("popdown");
2852	$self->{hover}[1]->() if $self->{hover};	2971	$self->{hover}[1]->() if $self->{hover};
		2972	} else {
		2973	return 0
		2974	}
		2975
2853	}	2976	1
2854	}	2977	}
2855		2978
2856	#############################################################################	2979	#############################################################################
2857		2980
2858	package CFClient::UI::Statusbox;	2981	package CFClient::UI::Multiplexer;
2859		2982
2860	our @ISA = CFClient::UI::VBox::;	2983	our @ISA = CFClient::UI::Container::;
2861		2984
2862	sub new {	2985	sub new {
2863	my $class = shift;	2986	my $class = shift;
2864		2987
2865	$class->SUPER::new (	2988	my $self = $class->SUPER::new (
		2989	@_,
		2990	);
		2991
		2992	$self->{current} = $self->{children}[0]
		2993	if @{ $self->{children} };
		2994
		2995	$self
		2996	}
		2997
		2998	sub add {
		2999	my ($self, @widgets) = @_;
		3000
		3001	$self->SUPER::add (@widgets);
		3002
		3003	$self->{current} = $self->{children}[0]
		3004	if @{ $self->{children} };
		3005	}
		3006
		3007	sub set_current_page {
		3008	my ($self, $page_or_widget) = @_;
		3009
		3010	my $widget = ref $page_or_widget
		3011	? $page_or_widget
		3012	: $self->{children}[$page_or_widget];
		3013
		3014	$self->{current} = $widget;
		3015	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3016
		3017	$self->_emit (page_changed => $self->{current});
		3018
		3019	$self->realloc;
		3020	}
		3021
		3022	sub visible_children {
		3023	$_[0]{current}
		3024	}
		3025
		3026	sub size_request {
		3027	my ($self) = @_;
		3028
		3029	$self->{current}->size_request
		3030	}
		3031
		3032	sub size_allocate {
		3033	my ($self, $w, $h) = @_;
		3034
		3035	$self->{current}->configure (0, 0, $w, $h);
		3036	}
		3037
		3038	sub _draw {
		3039	my ($self) = @_;
		3040
		3041	$self->{current}->draw;
		3042	}
		3043
		3044	#############################################################################
		3045
		3046	package CFClient::UI::Notebook;
		3047
		3048	our @ISA = CFClient::UI::VBox::;
		3049
		3050	sub new {
		3051	my $class = shift;
		3052
		3053	my $self = $class->SUPER::new (
		3054	buttonbar => (new CFClient::UI::Buttonbar),
		3055	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3056	# filter => # will be put between multiplexer and $self
		3057	@_,
		3058	);
		3059
		3060	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3061	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
		3062
		3063	$self
		3064	}
		3065
		3066	sub add {
		3067	my ($self, $title, $widget, $tooltip) = @_;
		3068
		3069	Scalar::Util::weaken $self;
		3070
		3071	$self->{buttonbar}->add (new CFClient::UI::Button
		3072	markup => $title,
		3073	tooltip => $tooltip,
		3074	on_activate => sub { $self->set_current_page ($widget) },
		3075	);
		3076
		3077	$self->{multiplexer}->add ($widget);
		3078	}
		3079
		3080	sub set_current_page {
		3081	my ($self, $page) = @_;
		3082
		3083	$self->{multiplexer}->set_current_page ($page);
		3084	$self->_emit (page_changed => $self->{multiplexer}{current});
		3085	}
		3086
		3087	#############################################################################
		3088
		3089	package CFClient::UI::Statusbox;
		3090
		3091	our @ISA = CFClient::UI::VBox::;
		3092
		3093	sub new {
		3094	my $class = shift;
		3095
		3096	my $self = $class->SUPER::new (
2866	fontsize => 0.8,	3097	fontsize => 0.8,
2867	@_,	3098	@_,
2868	)	3099	);
		3100
		3101	Scalar::Util::weaken (my $this = $self);
		3102
		3103	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3104
		3105	$self
2869	}	3106	}
2870		3107
2871	sub reorder {	3108	sub reorder {
2872	my ($self) = @_;	3109	my ($self) = @_;
2873	my $NOW = time;	3110	my $NOW = Time::HiRes::time;
		3111
		3112	# freeze display when hovering over any label
		3113	return if $CFClient::UI::TOOLTIP->{owner}
		3114	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3115	values %{ $self->{item} };
2874		3116
2875	while (my ($k, $v) = each %{ $self->{item} }) {	3117	while (my ($k, $v) = each %{ $self->{item} }) {
2876	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3118	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877	}	3119	}
2878		3120
…		…
2881	my @items = sort {	3123	my @items = sort {
2882	$a->{pri} <=> $b->{pri}	3124	$a->{pri} <=> $b->{pri}
2883	or $b->{id} <=> $a->{id}	3125	or $b->{id} <=> $a->{id}
2884	} values %{ $self->{item} };	3126	} values %{ $self->{item} };
2885		3127
		3128	$self->{timer}->interval (1);
		3129
2886	my $count = 10 + 1;	3130	my $count = 10 + 1;
2887	for my $item (@items) {	3131	for my $item (@items) {
2888	last unless --$count;	3132	last unless --$count;
2889		3133
2890	push @widgets, $item->{label} \|\|= do {	3134	my $label = $item->{label} \|\|= do {
2891	# TODO: doesn't handle markup well (read as: at all)	3135	# TODO: doesn't handle markup well (read as: at all)
2892	my $short = $item->{count} > 1	3136	my $short = $item->{count} > 1
2893	? "<b>$item->{count} ×</b> $item->{text}"	3137	? "<b>$item->{count} ×</b> $item->{text}"
2894	: $item->{text};	3138	: $item->{text};
2895		3139
…		…
2903	tooltip => $item->{tooltip},	3147	tooltip => $item->{tooltip},
2904	tooltip_font => $::FONT_PROP,	3148	tooltip_font => $::FONT_PROP,
2905	tooltip_width => 0.67,	3149	tooltip_width => 0.67,
2906	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3150	fontsize => $item->{fontsize} \|\| $self->{fontsize},
2907	max_w => $::WIDTH * 0.44,	3151	max_w => $::WIDTH * 0.44,
2908	fg => $item->{fg},	3152	fg => [@{ $item->{fg} }],
2909	can_events => 1,	3153	can_events => 1,
2910	can_hover => 1	3154	can_hover => 1
2911	};	3155	};
		3156
		3157	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3158	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3159	$label->update;
		3160	$label->set_max_size (undef, $label->{req_h} * $diff)
		3161	if $diff < 1;
		3162	$self->{timer}->interval (1/30);
		3163	} else {
		3164	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3165	}
		3166
		3167	push @widgets, $label;
2912	}	3168	}
2913		3169
2914	$self->clear;	3170	$self->clear;
2915	$self->SUPER::add (reverse @widgets);	3171	$self->SUPER::add (reverse @widgets);
2916	}	3172	}
…		…
2921	$text =~ s/^\s+//;	3177	$text =~ s/^\s+//;
2922	$text =~ s/\s+$//;	3178	$text =~ s/\s+$//;
2923		3179
2924	return unless $text;	3180	return unless $text;
2925		3181
2926	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3182	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
2927		3183
2928	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3184	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929		3185
2930	if (my $item = $self->{item}{$group}) {	3186	if (my $item = $self->{item}{$group}) {
2931	if ($item->{text} eq $text) {	3187	if ($item->{text} eq $text) {
…		…
2961		3217
2962	$self->reorder;	3218	$self->reorder;
2963	$self->SUPER::reconfigure;	3219	$self->SUPER::reconfigure;
2964	}	3220	}
2965		3221
		3222	sub DESTROY {
		3223	my ($self) = @_;
		3224
		3225	$self->{timer}->cancel;
		3226
		3227	$self->SUPER::DESTROY;
		3228	}
		3229
2966	#############################################################################	3230	#############################################################################
2967		3231
2968	package CFClient::UI::Inventory;	3232	package CFClient::UI::Inventory;
2969		3233
2970	our @ISA = CFClient::UI::ScrolledWindow::;	3234	our @ISA = CFClient::UI::ScrolledWindow::;
2971		3235
2972	sub new {	3236	sub new {
2973	my $class = shift;	3237	my $class = shift;
2974		3238
2975	my $self = $class->SUPER::new (	3239	my $self = $class->SUPER::new (
2976	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3240	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977	@_,	3241	@_,
2978	);	3242	);
2979		3243
2980	$self	3244	$self
2981	}	3245	}
2982		3246
2983	sub set_items {	3247	sub set_items {
2984	my ($self, $items) = @_;	3248	my ($self, $items) = @_;
2985		3249
2986	$self->{scrolled}->clear;	3250	$self->{child}->clear;
2987	return unless $items;	3251	return unless $items;
2988		3252
2989	my @items = sort {	3253	my @items = sort {
2990	($a->{type} <=> $b->{type})	3254	($a->{type} <=> $b->{type})
2991	or ($a->{name} cmp $b->{name})	3255	or ($a->{name} cmp $b->{name})
…		…
2995		3259
2996	my $row = 0;	3260	my $row = 0;
2997	for my $item (@items) {	3261	for my $item (@items) {
2998	CFClient::Item::update_widgets $item;	3262	CFClient::Item::update_widgets $item;
2999		3263
3000	$self->{scrolled}->add (0, $row, $item->{face_widget});	3264	$self->{child}->add (0, $row, $item->{face_widget});
3001	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3265	$self->{child}->add (1, $row, $item->{desc_widget});
3002	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3266	$self->{child}->add (2, $row, $item->{weight_widget});
3003		3267
3004	$row++;	3268	$row++;
3005	}	3269	}
3006	}	3270	}
3007		3271
…		…
3105	$rec = $::CONN->stop_record if $::CONN;	3369	$rec = $::CONN->stop_record if $::CONN;
3106	return unless ref $rec eq 'ARRAY';	3370	return unless ref $rec eq 'ARRAY';
3107	$self->set_command_list ($rec);	3371	$self->set_command_list ($rec);
3108	}	3372	}
3109		3373
3110	# if $commit is true, the binding will be set after the user entered a key combo	3374
		3375	sub ask_for_bind_and_commit {
		3376	my ($self) = @_;
		3377	$self->ask_for_bind (1);
		3378	}
		3379
3111	sub ask_for_bind {	3380	sub ask_for_bind {
3112	my ($self, $commit) = @_;	3381	my ($self, $commit) = @_;
3113		3382
3114	CFClient::Binder::open_binding_dialog (sub {	3383	CFClient::Binder::open_binding_dialog (sub {
3115	my ($mod, $sym) = @_;	3384	my ($mod, $sym) = @_;
…		…
3199		3468
3200	#############################################################################	3469	#############################################################################
3201		3470
3202	package CFClient::UI::SpellList;	3471	package CFClient::UI::SpellList;
3203		3472
3204	our @ISA = CFClient::UI::FancyFrame::;	3473	our @ISA = CFClient::UI::Table::;
3205		3474
3206	sub new {	3475	sub new {
3207	my $class = shift;	3476	my $class = shift;
3208		3477
3209	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3478	my $self = $class->SUPER::new (
3210		3479	binding => [],
3211	$self->add (new CFClient::UI::ScrolledWindow	3480	commands => [],
3212	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3481	@_,
3213		3482	)
3214	$self;
3215	}	3483	}
3216		3484
3217	# XXX: Do sorting? Argl...	3485	# XXX: Do sorting? Argl...
3218	sub add_spell {	3486	sub add_spell {
3219	my ($self, $spell) = @_;	3487	my ($self, $spell) = @_;
3220	$self->{spells}->{$spell->{name}} = $spell;	3488	$self->{spells}->{$spell->{name}} = $spell;
3221		3489
3222	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face	3490	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223	face => $spell->{face},	3491	face => $spell->{face},
3224	can_hover => 1,	3492	can_hover => 1,
3225	can_events => 1,	3493	can_events => 1,
3226	tooltip => $spell->{message});	3494	tooltip => $spell->{message});
3227		3495
3228	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label	3496	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229	text => $spell->{name},	3497	text => $spell->{name},
3230	can_hover => 1,	3498	can_hover => 1,
3231	can_events => 1,	3499	can_events => 1,
3232	tooltip => $spell->{message},	3500	tooltip => $spell->{message},
3233	expand => 1);	3501	expand => 1);
3234		3502
3235	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label	3503	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",	3504	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),	3505	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3238	expand => 1);	3506	expand => 1);
3239		3507
3240	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button	3508	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241	text => "bind to key",	3509	text => "bind to key",
3242	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });	3510	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243	}	3511	}
3244		3512
3245	sub rebuild_spell_list {	3513	sub rebuild_spell_list {
…		…
3258		3526
3259	package CFClient::UI::Root;	3527	package CFClient::UI::Root;
3260		3528
3261	our @ISA = CFClient::UI::Container::;	3529	our @ISA = CFClient::UI::Container::;
3262		3530
		3531	use List::Util qw(min max);
		3532
3263	use CFClient::OpenGL;	3533	use CFClient::OpenGL;
3264		3534
3265	sub new {	3535	sub new {
3266	my $class = shift;	3536	my $class = shift;
3267		3537
…		…
3372	$_->()	3642	$_->()
3373	for values %{delete $self->{refresh_hook}};	3643	for values %{delete $self->{refresh_hook}};
3374	}	3644	}
3375		3645
3376	if ($self->{realloc}) {	3646	if ($self->{realloc}) {
		3647	my %queue;
3377	my @queue;	3648	my @queue;
		3649	my $widget;
3378		3650
		3651	outer:
3379	while () {	3652	while () {
3380	if ($self->{realloc}) {	3653	if (my $realloc = delete $self->{realloc}) {
3381	#TODO use array-of-depth approach	3654	for $widget (values %$realloc) {
		3655	$widget->{visible} or next; # do not resize invisible widgets
3382		3656
3383	use sort 'stable';	3657	$queue{$widget+0}++ and next; # duplicates are common
3384		3658
3385	@queue = sort { $a->{visible} <=> $b->{visible} }	3659	push @{ $queue[$widget->{visible}] }, $widget;
3386	@queue, values %{delete $self->{realloc}};	3660	}
3387	}	3661	}
3388		3662
		3663	while () {
		3664	@queue or last outer;
		3665
3389	my $widget = pop @queue \|\| last;	3666	$widget = pop @{ $queue[-1] \|\| [] }
		3667	and last;
		3668
		3669	pop @queue;
		3670	}
3390		3671
3391	$widget->{visible} or last; # do not resize invisible widgets	3672	delete $queue{$widget+0};
3392		3673
3393	my ($w, $h) = $widget->size_request;	3674	my ($w, $h) = $widget->size_request;
3394		3675
3395	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3676	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3677	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3678
		3679	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3680	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3397		3681
3398	$w = $widget->{force_w} if exists $widget->{force_w};	3682	$w = $widget->{force_w} if exists $widget->{force_w};
3399	$h = $widget->{force_h} if exists $widget->{force_h};	3683	$h = $widget->{force_h} if exists $widget->{force_h};
3400		3684
3401	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3685	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
…		…
3404	$widget->{req_h} = $h;	3688	$widget->{req_h} = $h;
3405		3689
3406	$self->{size_alloc}{$widget+0} = $widget;	3690	$self->{size_alloc}{$widget+0} = $widget;
3407		3691
3408	if (my $parent = $widget->{parent}) {	3692	if (my $parent = $widget->{parent}) {
3409	$self->{realloc}{$parent+0} = $parent;	3693	$self->{realloc}{$parent+0} = $parent
3410	#unshift @queue, $parent;	3694	unless $queue{$parent+0};
		3695
3411	$parent->{force_size_alloc} = 1;	3696	$parent->{force_size_alloc} = 1;
3412	$self->{size_alloc}{$parent+0} = $parent;	3697	$self->{size_alloc}{$parent+0} = $parent;
3413	}	3698	}
3414	}	3699	}
3415		3700
…		…
3431		3716
3432	$w = int $w + 0.5;	3717	$w = int $w + 0.5;
3433	$h = int $h + 0.5;	3718	$h = int $h + 0.5;
3434		3719
3435	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {	3720	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3721	$widget->{old_w} = $widget->{w};
		3722	$widget->{old_h} = $widget->{h};
		3723
3436	$widget->{w} = $w;	3724	$widget->{w} = $w;
3437	$widget->{h} = $h;	3725	$widget->{h} = $h;
3438		3726
3439	$widget->emit (size_allocate => $w, $h);	3727	$widget->emit (size_allocate => $w, $h);
3440	}	3728	}
…		…
3455	glLoadIdentity;	3743	glLoadIdentity;
3456	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3744	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3457	glMatrixMode GL_MODELVIEW;	3745	glMatrixMode GL_MODELVIEW;
3458	glLoadIdentity;	3746	glLoadIdentity;
3459		3747
		3748	{
		3749	package CFClient::UI::Base;
		3750
		3751	($draw_x, $draw_y, $draw_w, $draw_h) =
		3752	(0, 0, $self->{w}, $self->{h});
		3753	}
		3754
3460	$self->_draw;	3755	$self->_draw;
3461	}	3756	}
3462		3757
3463	#############################################################################	3758	#############################################################################
3464		3759

Diff Legend

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

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.288 by root, Mon Jun 5 21:14:40 2006 UTC

Diff Legend

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.288 by root, Mon Jun 5 21:14:40 2006 UTC