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.259 by root, Tue May 30 07:13:09 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 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;
…		…
270		272
271	return unless $self->{visible};	273	return unless $self->{visible};
272		274
273	$_->set_invisible for $self->children;	275	$_->set_invisible for $self->children;
274		276
		277	delete $self->{visible};
275	delete $self->{root};	278	delete $self->{root};
276	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);
…		…
313	}	315	}
314		316
315	sub move_abs {	317	sub move_abs {
316	my ($self, $x, $y, $z) = @_;	318	my ($self, $x, $y, $z) = @_;
317		319
318	$self->{x} = List::Util::max 0, int $x;	320	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319	$self->{y} = List::Util::max 0, int $y;	321	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320	$self->{z} = $z if defined $z;	322	$self->{z} = $z if defined $z;
321		323
322	$self->update;	324	$self->update;
323	}	325	}
324		326
…		…
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
…		…
575		593
576	sub DESTROY {	594	sub DESTROY {
577	my ($self) = @_;	595	my ($self) = @_;
578		596
579	delete $WIDGET{$self+0};	597	delete $WIDGET{$self+0};
580	#$self->deactivate;	598
		599	eval { $self->destroy };
		600	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
581	}	601	}
582		602
583	#############################################################################	603	#############################################################################
584		604
585	package CFClient::UI::DrawBG;	605	package CFClient::UI::DrawBG;
…		…
610		630
611	if ($color && (@$color < 4 || $color->[3])) {	631	if ($color && (@$color < 4 || $color->[3])) {
612	my ($w, $h) = @$self{qw(w h)};	632	my ($w, $h) = @$self{qw(w h)};
613		633
614	glEnable GL_BLEND;	634	glEnable GL_BLEND;
615	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	635	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616	glColor @$color;	636	glColor_premultiply @$color;
617		637
618	glBegin GL_QUADS;	638	glBegin GL_QUADS;
619	glVertex 0 , 0;	639	glVertex 0 , 0;
620	glVertex 0 , $h;	640	glVertex 0 , $h;
621	glVertex $w, $h;	641	glVertex $w, $h;
…		…
652	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFClient::UI::Base::;
653		673
654	sub new {	674	sub new {
655	my ($class, %arg) = @_;	675	my ($class, %arg) = @_;
656		676
657	my $children = delete $arg{children} || [];	677	my $children = delete $arg{children};
658		678
659	my $self = $class->SUPER::new (	679	my $self = $class->SUPER::new (
660	children => [],	680	children => [],
661	can_events => 0,	681	can_events => 0,
662	%arg,	682	%arg,
663	);	683	);
		684
664	$self->add ($_) for @$children;	685	$self->add (@$children)
		686	if $children;
665		687
666	$self	688	$self
667	}	689	}
668		690
669	sub add {	691	sub add {
…		…
717	$x -= $self->{x};	739	$x -= $self->{x};
718	$y -= $self->{y};	740	$y -= $self->{y};
719		741
720	my $res;	742	my $res;
721		743
722	for (reverse @{ $self->{children} }) {	744	for (reverse $self->visible_children) {
723	$res = $_->find_widget ($x, $y)	745	$res = $_->find_widget ($x, $y)
724	and return $res;	746	and return $res;
725	}	747	}
726		748
727	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	749	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
748	}	770	}
749		771
750	sub add {	772	sub add {
751	my ($self, $child) = @_;	773	my ($self, $child) = @_;
752		774
753	$self->{children} = [];	775	$self->SUPER::remove ($_) for @{ $self->{children} };
754
755	$self->SUPER::add ($child);	776	$self->SUPER::add ($child);
756	}	777	}
757		778
758	sub remove {	779	sub remove {
759	my ($self, $widget) = @_;	780	my ($self, $widget) = @_;
…		…
776	$self->{children}[0]->configure (0, 0, $w, $h);	797	$self->{children}[0]->configure (0, 0, $w, $h);
777	}	798	}
778		799
779	#############################################################################	800	#############################################################################
780		801
		802	# back-buffered drawing area
		803
781	package CFClient::UI::Window;	804	package CFClient::UI::Window;
782		805
783	our @ISA = CFClient::UI::Bin::;	806	our @ISA = CFClient::UI::Bin::;
784		807
785	use CFClient::OpenGL;	808	use CFClient::OpenGL;
…		…
803	$self->SUPER::size_allocate ($w, $h);	826	$self->SUPER::size_allocate ($w, $h);
804	$self->update;	827	$self->update;
805	}	828	}
806		829
807	sub _render {	830	sub _render {
		831	my ($self) = @_;
		832
808	$_[0]{children}[0]->draw;	833	$self->{children}[0]->draw;
809	}	834	}
810		835
811	sub render_child {	836	sub render_child {
812	my ($self) = @_;	837	my ($self) = @_;
813		838
814	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815	glClearColor 0, 0, 0, 0;	840	glClearColor 0, 0, 0, 0;
816	glClear GL_COLOR_BUFFER_BIT;	841	glClear GL_COLOR_BUFFER_BIT;
817		842
		843	{
		844	package CFClient::UI::Base;
		845
		846	($draw_x, $draw_y, $draw_w, $draw_h) =
		847	(0, 0, $self->{w}, $self->{h});
		848	}
		849
818	$self->_render;	850	$self->_render;
819	};	851	};
820	}	852	}
821		853
822	sub _draw {	854	sub _draw {
823	my ($self) = @_;	855	my ($self) = @_;
824		856
825	my ($w, $h) = ($self->w, $self->h);	857	my ($w, $h) = @$self{qw(w h)};
826		858
827	my $tex = $self->{texture}	859	my $tex = $self->{texture}
828	or return;	860	or return;
829		861
830	glEnable GL_TEXTURE_2D;	862	glEnable GL_TEXTURE_2D;
831	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832	glColor 1, 1, 1, 1;	864	glColor 0, 0, 0, 1;
833		865
834	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835		867
836	glDisable GL_TEXTURE_2D;	868	glDisable GL_TEXTURE_2D;
837	}	869	}
…		…
913	}	945	}
914		946
915	sub _render {	947	sub _render {
916	my ($self) = @_;	948	my ($self) = @_;
917		949
		950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		952
918	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919		954
920	$self->SUPER::_render;	955	$self->SUPER::_render;
921	}	956	}
922		957
…		…
925	package CFClient::UI::ScrolledWindow;	960	package CFClient::UI::ScrolledWindow;
926		961
927	our @ISA = CFClient::UI::HBox::;	962	our @ISA = CFClient::UI::HBox::;
928		963
929	sub new {	964	sub new {
930	my $class = shift;	965	my ($class, %arg) = @_;
		966
		967	my $child = delete $arg{child};
931		968
932	my $self;	969	my $self;
933		970
934	my $slider = new CFClient::UI::Slider	971	my $slider = new CFClient::UI::Slider
935	vertical => 1,	972	vertical => 1,
…		…
940	;	977	;
941		978
942	$self = $class->SUPER::new (	979	$self = $class->SUPER::new (
943	vp => (new CFClient::UI::ViewPort expand => 1),	980	vp => (new CFClient::UI::ViewPort expand => 1),
944	slider => $slider,	981	slider => $slider,
945	@_,	982	%arg,
946	);	983	);
947		984
948	$self->{vp}->add ($self->{scrolled});
949	$self->add ($self->{vp});
950	$self->add ($self->{slider});	985	$self->SUPER::add ($self->{vp}, $self->{slider});
		986	$self->add ($child) if $child;
951		987
952	$self	988	$self
		989	}
		990
		991	sub add {
		992	my ($self, $widget) = @_;
		993
		994	$self->{vp}->add ($self->{child} = $widget);
953	}	995	}
954		996
955	sub update {	997	sub update {
956	my ($self) = @_;	998	my ($self) = @_;
957		999
…		…
996		1038
997	if ($self->{bg}) {	1039	if ($self->{bg}) {
998	my ($w, $h) = @$self{qw(w h)};	1040	my ($w, $h) = @$self{qw(w h)};
999		1041
1000	glEnable GL_BLEND;	1042	glEnable GL_BLEND;
1001	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1043	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002	glColor @{ $self->{bg} };	1044	glColor_premultiply @{ $self->{bg} };
1003		1045
1004	glBegin GL_QUADS;	1046	glBegin GL_QUADS;
1005	glVertex 0 , 0;	1047	glVertex 0 , 0;
1006	glVertex 0 , $h;	1048	glVertex 0 , $h;
1007	glVertex $w, $h;	1049	glVertex $w, $h;
…		…
1029	my @border =	1071	my @border =
1030	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1072	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);	1073	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032		1074
1033	sub new {	1075	sub new {
1034	my $class = shift;	1076	my ($class, %arg) = @_;
1035		1077
1036	my $self = $class->SUPER::new (	1078	my $self = $class->SUPER::new (
1037	bg => [1, 1, 1, 1],	1079	bg => [1, 1, 1, 1],
1038	border_bg => [1, 1, 1, 1],	1080	border_bg => [1, 1, 1, 1],
1039	border => 0.6,	1081	border => 0.6,
1040	can_events => 1,	1082	can_events => 1,
1041	min_w => 16,	1083	min_w => 16,
1042	min_h => 16,	1084	min_h => 16,
1043	@_	1085	%arg,
1044	);	1086	);
1045		1087
1046	$self->{title} &&= new CFClient::UI::Label	1088	$self->{title_widget} = new CFClient::UI::Label
1047	align => 0,	1089	align => 0,
1048	valign => 1,	1090	valign => 1,
1049	text => $self->{title},	1091	text => $self->{title},
1050	fontsize => $self->{border};	1092	fontsize => $self->{border},
		1093	if exists $self->{title};
1051		1094
1052	$self	1095	$self
		1096	}
		1097
		1098	sub add {
		1099	my ($self, @widgets) = @_;
		1100
		1101	$self->SUPER::add (@widgets);
		1102	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053	}	1103	}
1054		1104
1055	sub border {	1105	sub border {
1056	int $_[0]{border} * $::FONTSIZE	1106	int $_[0]{border} * $::FONTSIZE
1057	}	1107	}
1058		1108
1059	sub size_request {	1109	sub size_request {
1060	my ($self) = @_;	1110	my ($self) = @_;
		1111
		1112	$self->{title_widget}->size_request
		1113	if $self->{title_widget};
1061		1114
1062	my ($w, $h) = $self->SUPER::size_request;	1115	my ($w, $h) = $self->SUPER::size_request;
1063		1116
1064	(	1117	(
1065	$w + $self->border * 2,	1118	$w + $self->border * 2,
…		…
1068	}	1121	}
1069		1122
1070	sub size_allocate {	1123	sub size_allocate {
1071	my ($self, $w, $h) = @_;	1124	my ($self, $w, $h) = @_;
1072		1125
		1126	if ($self->{title_widget}) {
		1127	$self->{title_widget}{w} = $w;
		1128	$self->{title_widget}{h} = $h;
		1129	$self->{title_widget}->size_allocate ($w, $h);
		1130	}
		1131
		1132	my $border = $self->border;
		1133
1073	$h -= List::Util::max 0, $self->border * 2;	1134	$h -= List::Util::max 0, $border * 2;
1074	$w -= List::Util::max 0, $self->border * 2;	1135	$w -= List::Util::max 0, $border * 2;
1075		1136
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);	1137	$self->child->configure ($border, $border, $w, $h);
1080	}	1138	}
1081		1139
1082	sub button_down {	1140	sub button_down {
1083	my ($self, $ev, $x, $y) = @_;	1141	my ($self, $ev, $x, $y) = @_;
1084		1142
…		…
1103	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
1104		1162
1105	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107		1165
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108	$self->realloc;	1167	$self->realloc;
1109	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110	};	1168	};
1111		1169
1112	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
1113	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114	my ($bx, $by) = ($self->{x}, $self->{y});	1172	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1117	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
1118		1176
1119	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
1120		1178
1121	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1180	# HACK: the next line is required to enforce placement
		1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122	};	1182	};
		1183	} else {
		1184	return 0;
		1185	}
		1186
1123	}	1187	1
1124	}	1188	}
1125		1189
1126	sub button_up {	1190	sub button_up {
1127	my ($self, $ev, $x, $y) = @_;	1191	my ($self, $ev, $x, $y) = @_;
1128		1192
1129	delete $self->{motion};	1193	!!delete $self->{motion}
1130	}	1194	}
1131		1195
1132	sub mouse_motion {	1196	sub mouse_motion {
1133	my ($self, $ev, $x, $y) = @_;	1197	my ($self, $ev, $x, $y) = @_;
1134		1198
1135	$self->{motion}->($ev, $x, $y) if $self->{motion};	1199	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1200
		1201	!!$self->{motion}
1136	}	1202	}
1137		1203
1138	sub _draw {	1204	sub _draw {
1139	my ($self) = @_;	1205	my ($self) = @_;
1140		1206
		1207	my $child = $self->{children}[0];
		1208
1141	my ($w, $h ) = ($self->{w}, $self->{h});	1209	my ($w, $h ) = ($self->{w}, $self->{h});
1142	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1210	my ($cw, $ch) = ($child->{w}, $child->{h});
1143		1211
1144	glEnable GL_TEXTURE_2D;	1212	glEnable GL_TEXTURE_2D;
1145	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146		1214
1147	my $border = $self->border;	1215	my $border = $self->border;
…		…
1162	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1230	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163	}	1231	}
1164		1232
1165	glDisable GL_TEXTURE_2D;	1233	glDisable GL_TEXTURE_2D;
1166		1234
1167	$self->{title}->draw if $self->{title};
1168
1169	$self->child->draw;	1235	$child->draw;
		1236
		1237	if ($self->{title_widget}) {
		1238	glTranslate 0, $border - $self->{h};
		1239	$self->{title_widget}->_draw;
		1240	}
1170	}	1241	}
1171		1242
1172	#############################################################################	1243	#############################################################################
1173		1244
1174	package CFClient::UI::Table;	1245	package CFClient::UI::Table;
…		…
1197		1268
1198	$child->set_parent ($self);	1269	$child->set_parent ($self);
1199	$self->{children}[$y][$x] = $child;	1270	$self->{children}[$y][$x] = $child;
1200		1271
1201	$self->realloc;	1272	$self->realloc;
		1273	}
		1274
		1275	sub remove {
		1276	my ($self, $child) = @_;
		1277
		1278	# TODO: not yet implemented
1202	}	1279	}
1203		1280
1204	# TODO: move to container class maybe? send children a signal on removal?	1281	# TODO: move to container class maybe? send children a signal on removal?
1205	sub clear {	1282	sub clear {
1206	my ($self) = @_;	1283	my ($self) = @_;
…		…
1467		1544
1468	delete $self->{texture};	1545	delete $self->{texture};
1469	$self->SUPER::update;	1546	$self->SUPER::update;
1470	}	1547	}
1471		1548
		1549	sub realloc {
		1550	my ($self) = @_;
		1551
		1552	delete $self->{ox};
		1553	$self->SUPER::realloc;
		1554	}
		1555
1472	sub set_text {	1556	sub set_text {
1473	my ($self, $text) = @_;	1557	my ($self, $text) = @_;
1474		1558
1475	return if $self->{text} eq "T$text";	1559	return if $self->{text} eq "T$text";
1476	$self->{text} = "T$text";	1560	$self->{text} = "T$text";
1477		1561
1478	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1562	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479	$self->{layout}->set_text ($text);	1563	$self->{layout}->set_text ($text);
1480		1564
		1565	delete $self->{size_req};
1481	$self->realloc;	1566	$self->realloc;
1482	$self->update;	1567	$self->update;
1483	}	1568	}
1484		1569
1485	sub set_markup {	1570	sub set_markup {
…		…
1491	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1576	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492		1577
1493	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1578	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494	$self->{layout}->set_markup ($markup);	1579	$self->{layout}->set_markup ($markup);
1495		1580
		1581	delete $self->{size_req};
1496	$self->realloc;	1582	$self->realloc;
1497	$self->update;	1583	$self->update;
1498	}	1584	}
1499		1585
1500	sub size_request {	1586	sub size_request {
1501	my ($self) = @_;	1587	my ($self) = @_;
1502		1588
		1589	$self->{size_req} ||= do {
1503	$self->{layout}->set_font ($self->{font}) if $self->{font};	1590	$self->{layout}->set_font ($self->{font}) if $self->{font};
1504	$self->{layout}->set_width ($self->{max_w} || -1);	1591	$self->{layout}->set_width ($self->{max_w} || -1);
1505	$self->{layout}->set_ellipsise ($self->{ellipsise});	1592	$self->{layout}->set_ellipsise ($self->{ellipsise});
1506	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1593	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1594	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508		1595
1509	my ($w, $h) = $self->{layout}->size;	1596	my ($w, $h) = $self->{layout}->size;
1510		1597
1511	if (exists $self->{template}) {	1598	if (exists $self->{template}) {
1512	$self->{template}->set_font ($self->{font}) if $self->{font};	1599	$self->{template}->set_font ($self->{font}) if $self->{font};
1513	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1600	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514		1601
1515	my ($w2, $h2) = $self->{template}->size;	1602	my ($w2, $h2) = $self->{template}->size;
1516		1603
1517	$w = List::Util::max $w, $w2;	1604	$w = List::Util::max $w, $w2;
1518	$h = List::Util::max $h, $h2;	1605	$h = List::Util::max $h, $h2;
		1606	}
		1607
		1608	[$w, $h]
1519	}	1609	};
1520		1610
1521	($w, $h)	1611	@{ $self->{size_req} }
1522	}	1612	}
1523		1613
1524	sub size_allocate {	1614	sub size_allocate {
1525	my ($self, $w, $h) = @_;	1615	my ($self, $w, $h) = @_;
1526		1616
		1617	delete $self->{ox};
		1618
1527	delete $self->{texture};	1619	delete $self->{texture}
		1620	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1528	}	1621	}
1529		1622
1530	sub set_fontsize {	1623	sub set_fontsize {
1531	my ($self, $fontsize) = @_;	1624	my ($self, $fontsize) = @_;
1532		1625
1533	$self->{fontsize} = $fontsize;	1626	$self->{fontsize} = $fontsize;
1534	delete $self->{texture};	1627	delete $self->{texture};
1535		1628
1536	$self->realloc;	1629	$self->realloc;
		1630	}
		1631
		1632	sub reconfigure {
		1633	my ($self) = @_;
		1634
		1635	delete $self->{size_req};
		1636
		1637	$self->SUPER::reconfigure;
1537	}	1638	}
1538		1639
1539	sub _draw {	1640	sub _draw {
1540	my ($self) = @_;	1641	my ($self) = @_;
1541		1642
…		…
1547	$self->{layout}->set_width ($self->{w});	1648	$self->{layout}->set_width ($self->{w});
1548	$self->{layout}->set_ellipsise ($self->{ellipsise});	1649	$self->{layout}->set_ellipsise ($self->{ellipsise});
1549	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1650	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1651	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551		1652
1552	my $tex = new_from_layout CFClient::Texture $self->{layout};	1653	new_from_layout CFClient::Texture $self->{layout}
		1654	};
1553		1655
		1656	unless (exists $self->{ox}) {
1554	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1657	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1658	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556	: ($self->{w} - $tex->{w}) * 0.5);	1659	: ($self->{w} - $tex->{w}) * 0.5);
1557		1660
1558	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1661	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1662	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560	: ($self->{h} - $tex->{h}) * 0.5);	1663	: ($self->{h} - $tex->{h}) * 0.5);
1561
1562	$tex
1563	};	1664	};
1564		1665
1565	glEnable GL_TEXTURE_2D;	1666	glEnable GL_TEXTURE_2D;
1566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1667
		1668	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1669	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1567		1670
1568	if ($tex->{format} == GL_ALPHA) {	1671	if ($tex->{format} == GL_ALPHA) {
		1672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1569	glColor @{$self->{fg}};	1673	glColor @{$self->{fg}};
1570	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1674	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1571	} else {	1675	} else {
		1676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1677	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1573	}	1678	}
1574		1679
1575	glDisable GL_TEXTURE_2D;	1680	glDisable GL_TEXTURE_2D;
1576	}	1681	}
1577		1682
…		…
1594	can_hover => 1,	1699	can_hover => 1,
1595	can_focus => 1,	1700	can_focus => 1,
1596	valign => 0,	1701	valign => 0,
1597	can_events => 1,	1702	can_events => 1,
1598	#text => ...	1703	#text => ...
		1704	#hidden => "*",
1599	@_	1705	@_
1600	)	1706	)
1601	}	1707	}
1602		1708
1603	sub _set_text {	1709	sub _set_text {
…		…
1605		1711
1606	delete $self->{cur_h};	1712	delete $self->{cur_h};
1607		1713
1608	return if $self->{text} eq $text;	1714	return if $self->{text} eq $text;
1609		1715
1610	delete $self->{texture};
1611
1612	$self->{last_activity} = $::NOW;	1716	$self->{last_activity} = $::NOW;
1613	$self->{text} = $text;	1717	$self->{text} = $text;
1614		1718
1615	$text =~ s/./*/g if $self->{hidden};	1719	$text =~ s/./*/g if $self->{hidden};
1616	$self->{layout}->set_text ("$text ");	1720	$self->{layout}->set_text ("$text ");
		1721	delete $self->{size_req};
1617		1722
1618	$self->_emit (changed => $self->{text});	1723	$self->_emit (changed => $self->{text});
		1724
		1725	$self->realloc;
		1726	$self->update;
1619	}	1727	}
1620		1728
1621	sub set_text {	1729	sub set_text {
1622	my ($self, $text) = @_;	1730	my ($self, $text) = @_;
1623		1731
1624	$self->{cursor} = length $text;	1732	$self->{cursor} = length $text;
1625	$self->_set_text ($text);	1733	$self->_set_text ($text);
1626
1627	$self->realloc;
1628	}	1734	}
1629		1735
1630	sub get_text {	1736	sub get_text {
1631	$_[0]{text}	1737	$_[0]{text}
1632	}	1738	}
…		…
1662	$self->{cursor} = length $text;	1768	$self->{cursor} = length $text;
1663	} elsif ($uni == 27) {	1769	} elsif ($uni == 27) {
1664	$self->_emit ('escape');	1770	$self->_emit ('escape');
1665	} elsif ($uni) {	1771	} elsif ($uni) {
1666	substr $text, $self->{cursor}++, 0, chr $uni;	1772	substr $text, $self->{cursor}++, 0, chr $uni;
		1773	} else {
		1774	return 0;
1667	}	1775	}
1668		1776
1669	$self->_set_text ($text);	1777	$self->_set_text ($text);
1670		1778
1671	$self->realloc;	1779	$self->realloc;
		1780
		1781	1
1672	}	1782	}
1673		1783
1674	sub focus_in {	1784	sub focus_in {
1675	my ($self) = @_;	1785	my ($self) = @_;
1676		1786
…		…
1691	utf8::encode $text;	1801	utf8::encode $text;
1692	$self->{cursor} = length substr $text, 0, $idx;	1802	$self->{cursor} = length substr $text, 0, $idx;
1693		1803
1694	$self->_set_text ($self->{text});	1804	$self->_set_text ($self->{text});
1695	$self->update;	1805	$self->update;
		1806
		1807	1
1696	}	1808	}
1697		1809
1698	sub mouse_motion {	1810	sub mouse_motion {
1699	my ($self, $ev, $x, $y) = @_;	1811	my ($self, $ev, $x, $y) = @_;
1700	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1812	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1813
		1814	0
1701	}	1815	}
1702		1816
1703	sub _draw {	1817	sub _draw {
1704	my ($self) = @_;	1818	my ($self) = @_;
1705		1819
1706	local $self->{fg} = $self->{fg};	1820	local $self->{fg} = $self->{fg};
1707		1821
1708	if ($FOCUS == $self) {	1822	if ($FOCUS == $self) {
1709	glColor @{$self->{active_bg}};	1823	glColor_premultiply @{$self->{active_bg}};
1710	$self->{fg} = $self->{active_fg};	1824	$self->{fg} = $self->{active_fg};
1711	} else {	1825	} else {
1712	glColor @{$self->{bg}};	1826	glColor_premultiply @{$self->{bg}};
1713	}	1827	}
1714		1828
1715	glEnable GL_BLEND;	1829	glEnable GL_BLEND;
1716	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1830	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717	glBegin GL_QUADS;	1831	glBegin GL_QUADS;
1718	glVertex 0 , 0;	1832	glVertex 0 , 0;
1719	glVertex 0 , $self->{h};	1833	glVertex 0 , $self->{h};
1720	glVertex $self->{w}, $self->{h};	1834	glVertex $self->{w}, $self->{h};
1721	glVertex $self->{w}, 0;	1835	glVertex $self->{w}, 0;
…		…
1782	} else {	1896	} else {
1783	$self->set_text ($self->{history_saveback});	1897	$self->set_text ($self->{history_saveback});
1784	}	1898	}
1785		1899
1786	} else {	1900	} else {
1787	$self->SUPER::key_down ($ev);	1901	return $self->SUPER::key_down ($ev)
		1902	}
		1903
1788	}	1904	1
1789
1790	}	1905	}
1791		1906
1792	#############################################################################	1907	#############################################################################
1793		1908
1794	package CFClient::UI::Button;	1909	package CFClient::UI::Button;
…		…
1823	my ($self, $ev, $x, $y) = @_;	1938	my ($self, $ev, $x, $y) = @_;
1824		1939
1825	$self->emit ("activate")	1940	$self->emit ("activate")
1826	if $x >= 0 && $x < $self->{w}	1941	if $x >= 0 && $x < $self->{w}
1827	&& $y >= 0 && $y < $self->{h};	1942	&& $y >= 0 && $y < $self->{h};
		1943
		1944	1
1828	}	1945	}
1829		1946
1830	sub _draw {	1947	sub _draw {
1831	my ($self) = @_;	1948	my ($self) = @_;
1832		1949
1833	local $self->{fg} = $self->{fg};	1950	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835	if ($GRAB == $self) {
1836	$self->{fg} = $self->{active_fg};
1837	}
1838		1951
1839	glEnable GL_TEXTURE_2D;	1952	glEnable GL_TEXTURE_2D;
1840	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841	glColor 0, 0, 0, 1;	1954	glColor 0, 0, 0, 1;
1842		1955
…		…
1886		1999
1887	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2000	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2001	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889	$self->{state} = !$self->{state};	2002	$self->{state} = !$self->{state};
1890	$self->_emit (changed => $self->{state});	2003	$self->_emit (changed => $self->{state});
		2004	} else {
		2005	return 0
		2006	}
		2007
1891	}	2008	1
1892	}	2009	}
1893		2010
1894	sub _draw {	2011	sub _draw {
1895	my ($self) = @_;	2012	my ($self) = @_;
1896		2013
…		…
2063		2180
2064	my $h1 = $self->{h} * (1 - $ycut1);	2181	my $h1 = $self->{h} * (1 - $ycut1);
2065	my $h2 = $self->{h} * (1 - $ycut2);	2182	my $h2 = $self->{h} * (1 - $ycut2);
2066		2183
2067	glEnable GL_BLEND;	2184	glEnable GL_BLEND;
2068	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2185	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2186	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069	glEnable GL_TEXTURE_2D;	2187	glEnable GL_TEXTURE_2D;
2070	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2188	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071		2189
2072	glBindTexture GL_TEXTURE_2D, $t1->{name};	2190	glBindTexture GL_TEXTURE_2D, $t1->{name};
2073	glBegin GL_QUADS;	2191	glBegin GL_QUADS;
…		…
2194	sub set_range {	2312	sub set_range {
2195	my ($self, $range) = @_;	2313	my ($self, $range) = @_;
2196		2314
2197	($range, $self->{range}) = ($self->{range}, $range);	2315	($range, $self->{range}) = ($self->{range}, $range);
2198		2316
2199	$self->update
2200	if "@$range" ne "@{$self->{range}}";	2317	if ("@$range" ne "@{$self->{range}}") {
		2318	$self->update;
		2319	$self->set_value ($self->{range}[0]);
		2320	}
2201	}	2321	}
2202		2322
2203	sub set_value {	2323	sub set_value {
2204	my ($self, $value) = @_;	2324	my ($self, $value) = @_;
2205		2325
…		…
2234		2354
2235	$self->SUPER::button_down ($ev, $x, $y);	2355	$self->SUPER::button_down ($ev, $x, $y);
2236		2356
2237	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2357	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238		2358
2239	$self->mouse_motion ($ev, $x, $y);	2359	$self->mouse_motion ($ev, $x, $y)
2240	}	2360	}
2241		2361
2242	sub mouse_motion {	2362	sub mouse_motion {
2243	my ($self, $ev, $x, $y) = @_;	2363	my ($self, $ev, $x, $y) = @_;
2244		2364
…		…
2248	my (undef, $lo, $hi, $page) = @{$self->{range}};	2368	my (undef, $lo, $hi, $page) = @{$self->{range}};
2249		2369
2250	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2370	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251		2371
2252	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2372	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2373	} else {
		2374	return 0;
		2375	}
		2376
2253	}	2377	1
2254	}	2378	}
2255		2379
2256	sub update {	2380	sub update {
2257	my ($self) = @_;	2381	my ($self) = @_;
2258		2382
2259	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2383	delete $self->{knob_w};
		2384	$self->SUPER::update;
		2385	}
		2386
		2387	sub _draw {
		2388	my ($self) = @_;
		2389
		2390	unless ($self->{knob_w}) {
2260	$self->set_value ($self->{range}[0]);	2391	$self->set_value ($self->{range}[0]);
2261		2392
2262	my ($value, $lo, $hi, $page) = @{$self->{range}};	2393	my ($value, $lo, $hi, $page) = @{$self->{range}};
2263	my $range = ($hi - $page - $lo) || 1e-100;	2394	my $range = ($hi - $page - $lo) || 1e-100;
2264		2395
…		…
2270	$value = ($value - $lo) / $range;	2401	$value = ($value - $lo) / $range;
2271	$value = $value * $self->{scale} + $self->{offset};	2402	$value = $value * $self->{scale} + $self->{offset};
2272		2403
2273	$self->{knob_x} = $value - $knob_w * 0.5;	2404	$self->{knob_x} = $value - $knob_w * 0.5;
2274	$self->{knob_w} = $knob_w;	2405	$self->{knob_w} = $knob_w;
2275	});	2406	}
2276
2277	$self->SUPER::update;
2278	}
2279
2280	sub _draw {
2281	my ($self) = @_;
2282		2407
2283	$self->SUPER::_draw ();	2408	$self->SUPER::_draw ();
2284		2409
2285	glScale $self->{w}, $self->{h};	2410	glScale $self->{w}, $self->{h};
2286		2411
…		…
2347	sub set_range { shift->{slider}->set_range (@_) }	2472	sub set_range { shift->{slider}->set_range (@_) }
2348	sub set_value { shift->{slider}->set_value (@_) }	2473	sub set_value { shift->{slider}->set_value (@_) }
2349		2474
2350	#############################################################################	2475	#############################################################################
2351		2476
2352	package CFClient::UI::TextView;	2477	package CFClient::UI::TextScroller;
2353		2478
2354	our @ISA = CFClient::UI::HBox::;	2479	our @ISA = CFClient::UI::HBox::;
2355		2480
2356	use CFClient::OpenGL;	2481	use CFClient::OpenGL;
2357		2482
…		…
2359	my $class = shift;	2484	my $class = shift;
2360		2485
2361	my $self = $class->SUPER::new (	2486	my $self = $class->SUPER::new (
2362	fontsize => 1,	2487	fontsize => 1,
2363	can_events => 0,	2488	can_events => 0,
		2489	indent => 0,
2364	#font => default_font	2490	#font => default_font
2365	@_,	2491	@_,
2366		2492
2367	layout => (new CFClient::Layout 1),	2493	layout => (new CFClient::Layout 1),
2368	par => [],	2494	par => [],
…		…
2391	$self->SUPER::size_allocate ($w, $h);	2517	$self->SUPER::size_allocate ($w, $h);
2392		2518
2393	$self->{layout}->set_font ($self->{font}) if $self->{font};	2519	$self->{layout}->set_font ($self->{font}) if $self->{font};
2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2520	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395	$self->{layout}->set_width ($self->{children}[0]{w});	2521	$self->{layout}->set_width ($self->{children}[0]{w});
		2522	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396		2523
2397	$self->reflow;	2524	$self->reflow;
2398	}	2525	}
2399		2526
2400	sub text_size {	2527	sub text_size {
…		…
2402		2529
2403	my $layout = $self->{layout};	2530	my $layout = $self->{layout};
2404		2531
2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2532	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406	$layout->set_width ($self->{children}[0]{w} - $indent);	2533	$layout->set_width ($self->{children}[0]{w} - $indent);
		2534	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407	$layout->set_markup ($text);	2535	$layout->set_markup ($text);
2408		2536
2409	$layout->size	2537	$layout->size
2410	}	2538	}
2411		2539
…		…
2450		2578
2451	return unless $self->{h} > 0;	2579	return unless $self->{h} > 0;
2452		2580
2453	delete $self->{texture};	2581	delete $self->{texture};
2454		2582
2455	$ROOT->on_post_alloc ($self, sub {	2583	$ROOT->on_post_alloc ($self => sub {
2456	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2584	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457		2585
2458	if (delete $self->{need_reflow}) {	2586	if (delete $self->{need_reflow}) {
2459	my $height = 0;	2587	my $height = 0;
2460		2588
…		…
2463	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2591	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464		2592
2465	for (@{$self->{par}}) {	2593	for (@{$self->{par}}) {
2466	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2594	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467	$layout->set_width ($W - $_->[3]);	2595	$layout->set_width ($W - $_->[3]);
		2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2468	$layout->set_markup ($_->[4]);	2597	$layout->set_markup ($_->[4]);
2469	my ($w, $h) = $layout->size;	2598	my ($w, $h) = $layout->size;
2470	$_->[0] = $w + $_->[3];	2599	$_->[0] = $w + $_->[3];
2471	$_->[1] = $h;	2600	$_->[1] = $h;
2472	}	2601	}
…		…
2475	}	2604	}
2476		2605
2477	$self->{height} = $height;	2606	$self->{height} = $height;
2478		2607
2479	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2608	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2480		2609
2481	delete $self->{texture};	2610	delete $self->{texture};
2482	}	2611	}
2483		2612
2484	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2613	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485	glClearColor 0.5, 0.5, 0.5, 0;	2614	glClearColor 0, 0, 0, 0;
2486	glClear GL_COLOR_BUFFER_BIT;	2615	glClear GL_COLOR_BUFFER_BIT;
2487		2616
2488	my $top = int $self->{children}[1]{range}[0];	2617	my $top = int $self->{children}[1]{range}[0];
2489		2618
2490	my $y0 = $top;	2619	my $y0 = $top;
…		…
2504	my $h = $par->[1];	2633	my $h = $par->[1];
2505		2634
2506	if ($y0 < $y + $h && $y < $y1) {	2635	if ($y0 < $y + $h && $y < $y1) {
2507	$layout->set_foreground (@{ $par->[2] });	2636	$layout->set_foreground (@{ $par->[2] });
2508	$layout->set_width ($W - $par->[3]);	2637	$layout->set_width ($W - $par->[3]);
		2638	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509	$layout->set_markup ($par->[4]);	2639	$layout->set_markup ($par->[4]);
2510		2640
2511	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2641	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2512		2642
2513	glRasterPos $par->[3], $y - $y0;	2643	glRasterPos $par->[3], $y - $y0;
…		…
2525	sub _draw {	2655	sub _draw {
2526	my ($self) = @_;	2656	my ($self) = @_;
2527		2657
2528	glEnable GL_TEXTURE_2D;	2658	glEnable GL_TEXTURE_2D;
2529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2659	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530	glColor 1, 1, 1, 1;	2660	glColor 0, 0, 0, 1;
2531	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2661	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532	glDisable GL_TEXTURE_2D;	2662	glDisable GL_TEXTURE_2D;
2533		2663
2534	$self->{children}[1]->draw;	2664	$self->{children}[1]->draw;
2535		2665
2536	}	2666	}
…		…
2627	$tooltip .= "\n\n" . (ref $widget) . "\n"	2757	$tooltip .= "\n\n" . (ref $widget) . "\n"
2628	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2758	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629	. "req $widget->{req_w} $widget->{req_h}\n"	2759	. "req $widget->{req_w} $widget->{req_h}\n"
2630	. "visible $widget->{visible}";	2760	. "visible $widget->{visible}";
2631	}	2761	}
		2762
		2763	$tooltip =~ s/^\n+//;
		2764	$tooltip =~ s/\n+$//;
2632		2765
2633	$self->add (new CFClient::UI::Label	2766	$self->add (new CFClient::UI::Label
2634	markup => $tooltip,	2767	markup => $tooltip,
2635	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2768	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636	fontsize => 0.8,	2769	fontsize => 0.8,
…		…
2664	or return;	2797	or return;
2665		2798
2666	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2799	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667		2800
2668	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2801	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669	if $x + $self->{w} > $::WIDTH;	2802	if $x + $self->{w} > $self->{root}{w};
2670		2803
2671	$self->move_abs ($x, $y);	2804	$self->move_abs ($x, $y);
2672	});	2805	});
2673	}	2806	}
2674		2807
…		…
2763	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2896	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764		2897
2765	if ($tex) {	2898	if ($tex) {
2766	glEnable GL_TEXTURE_2D;	2899	glEnable GL_TEXTURE_2D;
2767	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2900	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768	glColor 1, 1, 1, 1;	2901	glColor 0, 0, 0, 1;
2769	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2902	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770	glDisable GL_TEXTURE_2D;	2903	glDisable GL_TEXTURE_2D;
2771	}	2904	}
2772	}	2905	}
2773		2906
2774	sub DESTROY {	2907	sub destroy {
2775	my ($self) = @_;	2908	my ($self) = @_;
2776		2909
2777	$self->{timer}->cancel	2910	$self->{timer}->cancel
2778	if $self->{timer};	2911	if $self->{timer};
2779		2912
2780	$self->SUPER::DESTROY;	2913	$self->SUPER::destroy;
2781	}	2914	}
2782		2915
2783	#############################################################################	2916	#############################################################################
2784		2917
2785	package CFClient::UI::Inventory;	2918	package CFClient::UI::Buttonbar;
2786		2919
2787	our @ISA = CFClient::UI::ScrolledWindow::;	2920	our @ISA = CFClient::UI::HBox::;
2788		2921
2789	sub new {	2922	# TODO: should actualyl wrap buttons and other goodies.
2790	my $class = shift;
2791
2792	my $self = $class->SUPER::new (
2793	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794	@_,
2795	);
2796
2797	$self
2798	}
2799
2800	sub set_items {
2801	my ($self, $items) = @_;
2802
2803	$self->{scrolled}->clear;
2804	return unless $items;
2805
2806	my @items = sort {
2807	($a->{type} <=> $b->{type})
2808	or ($a->{name} cmp $b->{name})
2809	} @$items;
2810
2811	$self->{real_items} = \@items;
2812
2813	my $row = 0;
2814	for my $item (@items) {
2815	CFClient::Item::update_widgets $item;
2816
2817	$self->{scrolled}->add (0, $row, $item->{face_widget});
2818	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2819	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821	$row++;
2822	}
2823	}
2824		2923
2825	#############################################################################	2924	#############################################################################
2826		2925
2827	package CFClient::UI::Menu;	2926	package CFClient::UI::Menu;
2828		2927
…		…
2840	);	2939	);
2841		2940
2842	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2941	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2843		2942
2844	for my $item (@{ $self->{items} }) {	2943	for my $item (@{ $self->{items} }) {
2845	my ($widget, $cb) = @$item;	2944	my ($widget, $cb, $tooltip) = @$item;
2846		2945
2847	# handle various types of items, only text for now	2946	# handle various types of items, only text for now
2848	if (!ref $widget) {	2947	if (!ref $widget) {
2849	$widget = new CFClient::UI::Label	2948	$widget = new CFClient::UI::Label
2850	can_hover => 1,	2949	can_hover => 1,
2851	can_events => 1,	2950	can_events => 1,
2852	text => $widget;	2951	markup => $widget,
		2952	tooltip => $tooltip
2853	}	2953	}
2854		2954
2855	$self->{item}{$widget} = $item;	2955	$self->{item}{$widget} = $item;
2856		2956
2857	$self->{vbox}->add ($widget);	2957	$self->{vbox}->add ($widget);
…		…
2878	my ($self, $ev, $x, $y) = @_;	2978	my ($self, $ev, $x, $y) = @_;
2879		2979
2880	# TODO: should use vbox->find_widget or so	2980	# TODO: should use vbox->find_widget or so
2881	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2981	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882	$self->{hover} = $self->{item}{$HOVER};	2982	$self->{hover} = $self->{item}{$HOVER};
		2983
		2984	0
2883	}	2985	}
2884		2986
2885	sub button_up {	2987	sub button_up {
2886	my ($self, $ev, $x, $y) = @_;	2988	my ($self, $ev, $x, $y) = @_;
2887		2989
…		…
2889	undef $GRAB;	2991	undef $GRAB;
2890	$self->hide;	2992	$self->hide;
2891		2993
2892	$self->_emit ("popdown");	2994	$self->_emit ("popdown");
2893	$self->{hover}[1]->() if $self->{hover};	2995	$self->{hover}[1]->() if $self->{hover};
		2996	} else {
		2997	return 0
		2998	}
		2999
2894	}	3000	1
2895	}	3001	}
2896		3002
2897	#############################################################################	3003	#############################################################################
2898		3004
2899	package CFClient::UI::Statusbox;	3005	package CFClient::UI::Multiplexer;
2900		3006
2901	our @ISA = CFClient::UI::VBox::;	3007	our @ISA = CFClient::UI::Container::;
2902		3008
2903	sub new {	3009	sub new {
2904	my $class = shift;	3010	my $class = shift;
2905		3011
2906	$class->SUPER::new (	3012	my $self = $class->SUPER::new (
		3013	@_,
		3014	);
		3015
		3016	$self->{current} = $self->{children}[0]
		3017	if @{ $self->{children} };
		3018
		3019	$self
		3020	}
		3021
		3022	sub add {
		3023	my ($self, @widgets) = @_;
		3024
		3025	$self->SUPER::add (@widgets);
		3026
		3027	$self->{current} = $self->{children}[0]
		3028	if @{ $self->{children} };
		3029	}
		3030
		3031	sub set_current_page {
		3032	my ($self, $page_or_widget) = @_;
		3033
		3034	my $widget = ref $page_or_widget
		3035	? $page_or_widget
		3036	: $self->{children}[$page_or_widget];
		3037
		3038	$self->{current} = $widget;
		3039	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3040
		3041	$self->_emit (page_changed => $self->{current});
		3042
		3043	$self->realloc;
		3044	}
		3045
		3046	sub visible_children {
		3047	$_[0]{current}
		3048	}
		3049
		3050	sub size_request {
		3051	my ($self) = @_;
		3052
		3053	$self->{current}->size_request
		3054	}
		3055
		3056	sub size_allocate {
		3057	my ($self, $w, $h) = @_;
		3058
		3059	$self->{current}->configure (0, 0, $w, $h);
		3060	}
		3061
		3062	sub _draw {
		3063	my ($self) = @_;
		3064
		3065	$self->{current}->draw;
		3066	}
		3067
		3068	#############################################################################
		3069
		3070	package CFClient::UI::Notebook;
		3071
		3072	our @ISA = CFClient::UI::VBox::;
		3073
		3074	sub new {
		3075	my $class = shift;
		3076
		3077	my $self = $class->SUPER::new (
		3078	buttonbar => (new CFClient::UI::Buttonbar),
		3079	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3080	# filter => # will be put between multiplexer and $self
		3081	@_,
		3082	);
		3083
		3084	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3085	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3086
		3087	$self
		3088	}
		3089
		3090	sub add {
		3091	my ($self, $title, $widget, $tooltip) = @_;
		3092
		3093	Scalar::Util::weaken $self;
		3094
		3095	$self->{buttonbar}->add (new CFClient::UI::Button
		3096	markup => $title,
		3097	tooltip => $tooltip,
		3098	on_activate => sub { $self->set_current_page ($widget) },
		3099	);
		3100
		3101	$self->{multiplexer}->add ($widget);
		3102	}
		3103
		3104	sub set_current_page {
		3105	my ($self, $page) = @_;
		3106
		3107	$self->{multiplexer}->set_current_page ($page);
		3108	$self->_emit (page_changed => $self->{multiplexer}{current});
		3109	}
		3110
		3111	#############################################################################
		3112
		3113	package CFClient::UI::Combobox;
		3114
		3115	use utf8;
		3116
		3117	our @ISA = CFClient::UI::Button::;
		3118
		3119	sub new {
		3120	my $class = shift;
		3121
		3122	my $self = $class->SUPER::new (
		3123	options => [], # [value, title, longdesc], ...
		3124	value => undef,
		3125	@_,
		3126	);
		3127
		3128	$self->_set_value ($self->{value});
		3129
		3130	$self
		3131	}
		3132
		3133	sub button_down {
		3134	my ($self, $ev) = @_;
		3135
		3136	my @menu_items;
		3137
		3138	for (@{ $self->{options} }) {
		3139	my ($value, $title, $tooltip) = @$_;
		3140
		3141	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3142	}
		3143
		3144	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3145	}
		3146
		3147	sub _set_value {
		3148	my ($self, $value) = @_;
		3149
		3150	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3151	or return;
		3152
		3153	$self->{value} = $item->[0];
		3154	$self->set_markup ("$item->[1] ⇓");
		3155	$self->set_tooltip ($item->[2]);
		3156	}
		3157
		3158	sub set_value {
		3159	my ($self, $value) = @_;
		3160
		3161	return unless $self->{value} ne $value;
		3162
		3163	$self->_set_value ($value);
		3164	$self->_emit (changed => $value);
		3165	}
		3166
		3167	#############################################################################
		3168
		3169	package CFClient::UI::Statusbox;
		3170
		3171	our @ISA = CFClient::UI::VBox::;
		3172
		3173	sub new {
		3174	my $class = shift;
		3175
		3176	my $self = $class->SUPER::new (
2907	fontsize => 0.8,	3177	fontsize => 0.8,
2908	@_,	3178	@_,
2909	)	3179	);
		3180
		3181	Scalar::Util::weaken (my $this = $self);
		3182
		3183	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3184
		3185	$self
2910	}	3186	}
2911		3187
2912	sub reorder {	3188	sub reorder {
2913	my ($self) = @_;	3189	my ($self) = @_;
2914	my $NOW = time;	3190	my $NOW = Time::HiRes::time;
		3191
		3192	# freeze display when hovering over any label
		3193	return if $CFClient::UI::TOOLTIP->{owner}
		3194	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3195	values %{ $self->{item} };
2915		3196
2916	while (my ($k, $v) = each %{ $self->{item} }) {	3197	while (my ($k, $v) = each %{ $self->{item} }) {
2917	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3198	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918	}	3199	}
2919		3200
…		…
2922	my @items = sort {	3203	my @items = sort {
2923	$a->{pri} <=> $b->{pri}	3204	$a->{pri} <=> $b->{pri}
2924	or $b->{id} <=> $a->{id}	3205	or $b->{id} <=> $a->{id}
2925	} values %{ $self->{item} };	3206	} values %{ $self->{item} };
2926		3207
		3208	$self->{timer}->interval (1);
		3209
2927	my $count = 10 + 1;	3210	my $count = 10 + 1;
2928	for my $item (@items) {	3211	for my $item (@items) {
2929	last unless --$count;	3212	last unless --$count;
2930		3213
2931	push @widgets, $item->{label} ||= do {	3214	my $label = $item->{label} ||= do {
2932	# TODO: doesn't handle markup well (read as: at all)	3215	# TODO: doesn't handle markup well (read as: at all)
2933	my $short = $item->{count} > 1	3216	my $short = $item->{count} > 1
2934	? "<b>$item->{count} ×</b> $item->{text}"	3217	? "<b>$item->{count} ×</b> $item->{text}"
2935	: $item->{text};	3218	: $item->{text};
2936		3219
…		…
2944	tooltip => $item->{tooltip},	3227	tooltip => $item->{tooltip},
2945	tooltip_font => $::FONT_PROP,	3228	tooltip_font => $::FONT_PROP,
2946	tooltip_width => 0.67,	3229	tooltip_width => 0.67,
2947	fontsize => $item->{fontsize} || $self->{fontsize},	3230	fontsize => $item->{fontsize} || $self->{fontsize},
2948	max_w => $::WIDTH * 0.44,	3231	max_w => $::WIDTH * 0.44,
2949	fg => $item->{fg},	3232	fg => [@{ $item->{fg} }],
2950	can_events => 1,	3233	can_events => 1,
2951	can_hover => 1	3234	can_hover => 1
2952	};	3235	};
		3236
		3237	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3238	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3239	$label->update;
		3240	$label->set_max_size (undef, $label->{req_h} * $diff)
		3241	if $diff < 1;
		3242	$self->{timer}->interval (1/30);
		3243	} else {
		3244	$label->{fg}[3] = $item->{fg}[3] || 1;
		3245	}
		3246
		3247	push @widgets, $label;
2953	}	3248	}
2954		3249
2955	$self->clear;	3250	$self->clear;
2956	$self->SUPER::add (reverse @widgets);	3251	$self->SUPER::add (reverse @widgets);
2957	}	3252	}
…		…
2962	$text =~ s/^\s+//;	3257	$text =~ s/^\s+//;
2963	$text =~ s/\s+$//;	3258	$text =~ s/\s+$//;
2964		3259
2965	return unless $text;	3260	return unless $text;
2966		3261
2967	my $timeout = time + ((delete $arg{timeout}) || 60);	3262	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968		3263
2969	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3264	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970		3265
2971	if (my $item = $self->{item}{$group}) {	3266	if (my $item = $self->{item}{$group}) {
2972	if ($item->{text} eq $text) {	3267	if ($item->{text} eq $text) {
2973	$item->{count}++;	3268	$item->{count}++;
2974	} else {	3269	} else {
2975	$item->{count} = 1;	3270	$item->{count} = 1;
2976	$item->{text} = $item->{tooltip} = $text;	3271	$item->{text} = $item->{tooltip} = $text;
2977	}	3272	}
2978	$item->{id} = ++$self->{id};	3273	$item->{id} += 0.2;#d#
2979	$item->{timeout} = $timeout;	3274	$item->{timeout} = $timeout;
2980	delete $item->{label};	3275	delete $item->{label};
2981	} else {	3276	} else {
2982	$self->{item}{$group} = {	3277	$self->{item}{$group} = {
2983	id => ++$self->{id},	3278	id => ++$self->{id},
…		…
3002		3297
3003	$self->reorder;	3298	$self->reorder;
3004	$self->SUPER::reconfigure;	3299	$self->SUPER::reconfigure;
3005	}	3300	}
3006		3301
		3302	sub destroy {
		3303	my ($self) = @_;
		3304
		3305	$self->{timer}->cancel;
		3306
		3307	$self->SUPER::destroy;
		3308	}
		3309
3007	#############################################################################	3310	#############################################################################
3008		3311
		3312	package CFClient::UI::Inventory;
		3313
		3314	our @ISA = CFClient::UI::ScrolledWindow::;
		3315
		3316	sub new {
		3317	my $class = shift;
		3318
		3319	my $self = $class->SUPER::new (
		3320	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3321	@_,
		3322	);
		3323
		3324	$self
		3325	}
		3326
		3327	sub set_items {
		3328	my ($self, $items) = @_;
		3329
		3330	$self->{child}->clear;
		3331	return unless $items;
		3332
		3333	my @items = sort {
		3334	($a->{type} <=> $b->{type})
		3335	or ($a->{name} cmp $b->{name})
		3336	} @$items;
		3337
		3338	$self->{real_items} = \@items;
		3339
		3340	my $row = 0;
		3341	for my $item (@items) {
		3342	CFClient::Item::update_widgets $item;
		3343
		3344	$self->{child}->add (0, $row, $item->{face_widget});
		3345	$self->{child}->add (1, $row, $item->{desc_widget});
		3346	$self->{child}->add (2, $row, $item->{weight_widget});
		3347
		3348	$row++;
		3349	}
		3350	}
		3351
		3352	#############################################################################
		3353
		3354	package CFClient::UI::BindEditor;
		3355
		3356	our @ISA = CFClient::UI::FancyFrame::;
		3357
		3358	sub new {
		3359	my $class = shift;
		3360
		3361	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3362
		3363	$self->add (my $vb = new CFClient::UI::VBox);
		3364
		3365
		3366	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3367	text => "start recording",
		3368	tooltip => "Start/Stops recording of actions."
		3369	."All subsequent actions after the recording started will be captured."
		3370	."The actions are displayed after the record was stopped."
		3371	."To bind the action you have to click on the 'Bind' button",
		3372	on_activate => sub {
		3373	unless ($self->{recording}) {
		3374	$self->start;
		3375	} else {
		3376	$self->stop;
		3377	}
		3378	});
		3379
		3380	$vb->add (new CFClient::UI::Label text => "Actions:");
		3381	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3382
		3383	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3384	$vb->add (my $hb = new CFClient::UI::HBox);
		3385	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3386	$hb->add (new CFClient::UI::Button
		3387	text => "bind",
		3388	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3389	on_activate => sub {
		3390	$self->ask_for_bind;
		3391	});
		3392
		3393	$vb->add (my $hb = new CFClient::UI::HBox);
		3394	$hb->add (new CFClient::UI::Button
		3395	text => "ok",
		3396	expand => 1,
		3397	tooltip => "This closes the binding editor and saves the binding",
		3398	on_activate => sub {
		3399	$self->hide;
		3400	$self->commit;
		3401	});
		3402
		3403	$hb->add (new CFClient::UI::Button
		3404	text => "cancel",
		3405	expand => 1,
		3406	tooltip => "This closes the binding editor without saving",
		3407	on_activate => sub {
		3408	$self->hide;
		3409	$self->{binding_cancel}->()
		3410	if $self->{binding_cancel};
		3411	});
		3412
		3413	$self->update_binding_widgets;
		3414
		3415	$self
		3416	}
		3417
		3418	sub commit {
		3419	my ($self) = @_;
		3420	my ($mod, $sym, $cmds) = $self->get_binding;
		3421	if ($sym != 0 && @$cmds > 0) {
		3422	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3423	."'. Don't forget 'Save Config'!");
		3424	$self->{binding_change}->($mod, $sym, $cmds)
		3425	if $self->{binding_change};
		3426	} else {
		3427	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3428	$self->{binding_cancel}->()
		3429	if $self->{binding_cancel};
		3430	}
		3431	}
		3432
		3433	sub start {
		3434	my ($self) = @_;
		3435
		3436	$self->{rec_btn}->set_text ("stop recording");
		3437	$self->{recording} = 1;
		3438	$self->clear_command_list;
		3439	$::CONN->start_record if $::CONN;
		3440	}
		3441
		3442	sub stop {
		3443	my ($self) = @_;
		3444
		3445	$self->{rec_btn}->set_text ("start recording");
		3446	$self->{recording} = 0;
		3447
		3448	my $rec;
		3449	$rec = $::CONN->stop_record if $::CONN;
		3450	return unless ref $rec eq 'ARRAY';
		3451	$self->set_command_list ($rec);
		3452	}
		3453
		3454
		3455	sub ask_for_bind_and_commit {
		3456	my ($self) = @_;
		3457	$self->ask_for_bind (1);
		3458	}
		3459
		3460	sub ask_for_bind {
		3461	my ($self, $commit) = @_;
		3462
		3463	CFClient::Binder::open_binding_dialog (sub {
		3464	my ($mod, $sym) = @_;
		3465	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3466	$self->update_binding_widgets;
		3467	$self->commit if $commit;
		3468	});
		3469	}
		3470
		3471	# $mod and $sym are the modifiers and key symbol
		3472	# $cmds is a array ref of strings (the commands)
		3473	# $cb is the callback that is executed on OK
		3474	# $ccb is the callback that is executed on CANCEL and
		3475	# when the binding was unsuccessful on OK
		3476	sub set_binding {
		3477	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3478
		3479	$self->clear_command_list;
		3480	$self->{recording} = 0;
		3481	$self->{rec_btn}->set_text ("start recording");
		3482
		3483	$self->{binding} = [$mod, $sym];
		3484	$self->{commands} = $cmds;
		3485
		3486	$self->{binding_change} = $cb;
		3487	$self->{binding_cancel} = $ccb;
		3488
		3489	$self->update_binding_widgets;
		3490	}
		3491
		3492	# this is a shortcut method that asks for a binding
		3493	# and then just binds it.
		3494	sub do_quick_binding {
		3495	my ($self, $cmds) = @_;
		3496	$self->set_binding (undef, undef, $cmds, sub {
		3497	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3498	});
		3499	$self->ask_for_bind (1);
		3500	}
		3501
		3502	sub update_binding_widgets {
		3503	my ($self) = @_;
		3504	my ($mod, $sym, $cmds) = $self->get_binding;
		3505	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3506	$self->set_command_list ($cmds);
		3507	}
		3508
		3509	sub get_binding {
		3510	my ($self) = @_;
		3511	return (
		3512	$self->{binding}->[0],
		3513	$self->{binding}->[1],
		3514	[ grep { defined $_ } @{$self->{commands}} ]
		3515	);
		3516	}
		3517
		3518	sub clear_command_list {
		3519	my ($self) = @_;
		3520	$self->{cmdbox}->clear ();
		3521	}
		3522
		3523	sub set_command_list {
		3524	my ($self, $cmds) = @_;
		3525
		3526	$self->{cmdbox}->clear ();
		3527	$self->{commands} = $cmds;
		3528
		3529	my $idx = 0;
		3530
		3531	for (@$cmds) {
		3532	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3533
		3534	my $i = $idx;
		3535	$hb->add (new CFClient::UI::Label text => $_);
		3536	$hb->add (new CFClient::UI::Button
		3537	text => "delete",
		3538	tooltip => "Deletes the action from the record",
		3539	on_activate => sub {
		3540	$self->{cmdbox}->remove ($hb);
		3541	$cmds->[$i] = undef;
		3542	});
		3543
		3544
		3545	$idx++
		3546	}
		3547	}
		3548
		3549	#############################################################################
		3550
		3551	package CFClient::UI::SpellList;
		3552
		3553	our @ISA = CFClient::UI::Table::;
		3554
		3555	sub new {
		3556	my $class = shift;
		3557
		3558	my $self = $class->SUPER::new (
		3559	binding => [],
		3560	commands => [],
		3561	@_,
		3562	)
		3563	}
		3564
		3565	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3566
		3567	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3568	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3569	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3570	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3571	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3572	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3573	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3574	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3575	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3576	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3577
		3578	sub rebuild_spell_list {
		3579	my ($self) = @_;
		3580
		3581	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3582	$self->clear;
		3583
		3584	return unless $::CONN;
		3585
		3586	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3587	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3588	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3589	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3590	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3591
		3592	my $row = 0;
		3593
		3594	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3595	my $spell = $self->{spell}{$_};
		3596
		3597	$row++;
		3598
		3599	my $spell_cb = sub {
		3600	my ($widget, $ev) = @_;
		3601
		3602	if ($ev->{button} == 1) {
		3603	$::CONN->user_send ("cast $spell->{name}");
		3604	} elsif ($ev->{button} == 2) {
		3605	$::CONN->user_send ("invoke $spell->{name}");
		3606	} elsif ($ev->{button} == 3) {
		3607	(new CFClient::UI::Menu
		3608	items => [
		3609	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3610	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3611	],
		3612	)->popup ($ev);
		3613	} else {
		3614	return 0;
		3615	}
		3616
		3617	1
		3618	};
		3619
		3620	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3621
		3622	#TODO: add path info to tooltip
		3623	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3624
		3625	$self->add (0, $row, new CFClient::UI::Face
		3626	face => $spell->{face},
		3627	can_hover => 1,
		3628	can_events => 1,
		3629	tooltip => $tooltip,
		3630	on_button_down => $spell_cb,
		3631	);
		3632
		3633	$self->add (1, $row, new CFClient::UI::Label
		3634	expand => 1,
		3635	text => $spell->{name},
		3636	can_hover => 1,
		3637	can_events => 1,
		3638	tooltip => $tooltip,
		3639	on_button_down => $spell_cb,
		3640	);
		3641
		3642	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3643	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3644	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3645	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3646	}
		3647	});
		3648	}
		3649
		3650	sub add_spell {
		3651	my ($self, $spell) = @_;
		3652
		3653	$self->{spell}->{$spell->{name}} = $spell;
		3654	$self->rebuild_spell_list;
		3655	}
		3656
		3657	sub remove_spell {
		3658	my ($self, $spell) = @_;
		3659
		3660	delete $self->{spell}->{$spell->{name}};
		3661	$self->rebuild_spell_list;
		3662	}
		3663
		3664	sub clear_spells {
		3665	my ($self) = @_;
		3666
		3667	$self->{spell} = {};
		3668	$self->rebuild_spell_list;
		3669	}
		3670
		3671	#############################################################################
		3672
3009	package CFClient::UI::Root;	3673	package CFClient::UI::Root;
3010		3674
3011	our @ISA = CFClient::UI::Container::;	3675	our @ISA = CFClient::UI::Container::;
		3676
		3677	use List::Util qw(min max);
3012		3678
3013	use CFClient::OpenGL;	3679	use CFClient::OpenGL;
3014		3680
3015	sub new {	3681	sub new {
3016	my $class = shift;	3682	my $class = shift;
…		…
3122	$_->()	3788	$_->()
3123	for values %{delete $self->{refresh_hook}};	3789	for values %{delete $self->{refresh_hook}};
3124	}	3790	}
3125		3791
3126	if ($self->{realloc}) {	3792	if ($self->{realloc}) {
		3793	my %queue;
3127	my @queue;	3794	my @queue;
		3795	my $widget;
3128		3796
		3797	outer:
3129	while () {	3798	while () {
3130	if ($self->{realloc}) {	3799	if (my $realloc = delete $self->{realloc}) {
3131	#TODO use array-of-depth approach	3800	for $widget (values %$realloc) {
		3801	$widget->{visible} or next; # do not resize invisible widgets
3132		3802
3133	use sort 'stable';	3803	$queue{$widget+0}++ and next; # duplicates are common
3134		3804
3135	@queue = sort { $a->{visible} <=> $b->{visible} }	3805	push @{ $queue[$widget->{visible}] }, $widget;
3136	@queue, values %{delete $self->{realloc}};	3806	}
3137	}	3807	}
3138		3808
		3809	while () {
		3810	@queue or last outer;
		3811
3139	my $widget = pop @queue || last;	3812	$widget = pop @{ $queue[-1] || [] }
		3813	and last;
		3814
		3815	pop @queue;
		3816	}
3140		3817
3141	$widget->{visible} or last; # do not resize invisible widgets	3818	delete $queue{$widget+0};
3142		3819
3143	my ($w, $h) = $widget->size_request;	3820	my ($w, $h) = $widget->size_request;
3144		3821
3145	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3822	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3823	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3824
		3825	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3826	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147		3827
3148	$w = $widget->{force_w} if exists $widget->{force_w};	3828	$w = $widget->{force_w} if exists $widget->{force_w};
3149	$h = $widget->{force_h} if exists $widget->{force_h};	3829	$h = $widget->{force_h} if exists $widget->{force_h};
3150		3830
3151	if ($widget->{req_w} != $w || $widget->{req_h} != $h	3831	if ($widget->{req_w} != $w || $widget->{req_h} != $h
…		…
3154	$widget->{req_h} = $h;	3834	$widget->{req_h} = $h;
3155		3835
3156	$self->{size_alloc}{$widget+0} = $widget;	3836	$self->{size_alloc}{$widget+0} = $widget;
3157		3837
3158	if (my $parent = $widget->{parent}) {	3838	if (my $parent = $widget->{parent}) {
3159	$self->{realloc}{$parent+0} = $parent;	3839	$self->{realloc}{$parent+0} = $parent
3160	#unshift @queue, $parent;	3840	unless $queue{$parent+0};
		3841
3161	$parent->{force_size_alloc} = 1;	3842	$parent->{force_size_alloc} = 1;
3162	$self->{size_alloc}{$parent+0} = $parent;	3843	$self->{size_alloc}{$parent+0} = $parent;
3163	}	3844	}
3164	}	3845	}
3165		3846
…		…
3181		3862
3182	$w = int $w + 0.5;	3863	$w = int $w + 0.5;
3183	$h = int $h + 0.5;	3864	$h = int $h + 0.5;
3184		3865
3185	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3866	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3867	$widget->{old_w} = $widget->{w};
		3868	$widget->{old_h} = $widget->{h};
		3869
3186	$widget->{w} = $w;	3870	$widget->{w} = $w;
3187	$widget->{h} = $h;	3871	$widget->{h} = $h;
3188		3872
3189	$widget->emit (size_allocate => $w, $h);	3873	$widget->emit (size_allocate => $w, $h);
3190	}	3874	}
…		…
3205	glLoadIdentity;	3889	glLoadIdentity;
3206	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207	glMatrixMode GL_MODELVIEW;	3891	glMatrixMode GL_MODELVIEW;
3208	glLoadIdentity;	3892	glLoadIdentity;
3209		3893
		3894	{
		3895	package CFClient::UI::Base;
		3896
		3897	($draw_x, $draw_y, $draw_w, $draw_h) =
		3898	(0, 0, $self->{w}, $self->{h});
		3899	}
		3900
3210	$self->_draw;	3901	$self->_draw;
3211	}	3902	}
3212		3903
3213	#############################################################################	3904	#############################################################################
3214		3905

Diff Legend

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