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.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.230 by root, Wed May 24 21:59:54 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	32	$TOOLTIP->show;
		33
		34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		35
		36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
		37	if $x + $TOOLTIP->{w} > $::WIDTH;
		38
		39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
31	}	42	}
32		43
33	return;	44	return;
34	}	45	}
35	}	46	}
…		…
123	for (@$vals) {	134	for (@$vals) {
124	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
125	$rem += $_ - $i;	136	$rem += $_ - $i;
126	$_ = $i;	137	$_ = $i;
127	}	138	}
		139	}
		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
		147	}
		148
		149	sub reconfigure_widgets {
		150	# make a copy, otherwise C<for> complains about freed values.
		151	my @widgets = values %WIDGET;
		152
		153	$_->reconfigure
		154	for @widgets;
		155	}
		156
		157	# call when resolution changes etc.
		158	sub rescale_widgets {
		159	my ($sx, $sy) = @_;
		160
		161	for my $widget (values %WIDGET) {
		162	if ($widget->{is_toplevel}) {
		163	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		164	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		165	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		166	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		167	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		168	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		169	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		170	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		171	}
		172	}
		173
		174	reconfigure_widgets;
128	}	175	}
129		176
130	#############################################################################	177	#############################################################################
131		178
132	package CFClient::UI::Base;	179	package CFClient::UI::Base;
…		…
150	if (/^connect_(.*)$/) {	197	if (/^connect_(.*)$/) {
151	$self->connect ($1 => delete $self->{$_});	198	$self->connect ($1 => delete $self->{$_});
152	}	199	}
153	}	200	}
154		201
		202	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		203
155	$self	204	$self
156	}	205	}
157		206
158	sub destroy {	207	sub destroy {
159	my ($self) = @_;	208	my ($self) = @_;
…		…
162	%$self = ();	211	%$self = ();
163	}	212	}
164		213
165	sub show {	214	sub show {
166	my ($self) = @_;	215	my ($self) = @_;
167
168	return if $self->{parent};	216	return if $self->{parent};
169		217
170	$CFClient::UI::ROOT->add ($self);	218	$CFClient::UI::ROOT->add ($self);
		219	}
		220
		221	sub show_centered {
		222	my ($self) = @_;
		223	return if $self->{parent};
		224
		225	$self->show;
		226
		227	$CFClient::UI::ROOT->on_post_alloc (
		228	"centered $self" => sub {
		229	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		230	},
		231	);
171	}	232	}
172		233
173	sub hide {	234	sub hide {
174	my ($self) = @_;	235	my ($self) = @_;
175		236
…		…
224	$self->{y} = $y;	285	$self->{y} = $y;
225	$self->update;	286	$self->update;
226	}	287	}
227		288
228	if ($self->{w} != $w || $self->{h} != $h) {	289	if ($self->{w} != $w || $self->{h} != $h) {
229	$self->{w} = $w;	290	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230	$self->{h} = $h;
231
232	$self->size_allocate ($w, $h);
233	$self->update;
234	}	291	}
235	}	292	}
236		293
237	sub size_allocate {	294	sub size_allocate {
238	# nothing to be done	295	# nothing to be done
239	}	296	}
240		297
		298	sub reconfigure {
		299	my ($self) = @_;
		300
		301	$self->check_size (1);
		302	$self->update;
		303	}
		304
		305	sub children {
		306	}
		307
241	sub set_max_size {	308	sub set_max_size {
242	my ($self, $w, $h) = @_;	309	my ($self, $w, $h) = @_;
243		310
244	delete $self->{max_w}; $self->{max_w} = $w if $w;	311	delete $self->{max_w}; $self->{max_w} = $w if $w;
245	delete $self->{max_h}; $self->{max_h} = $h if $h;	312	delete $self->{max_h}; $self->{max_h} = $h if $h;
246	}	313	}
247		314
248	# return top left coordinates	315	sub set_tooltip {
249	sub _topleft {
250	my ($self, $x, $y) = @_;	316	my ($self, $tooltip) = @_;
251		317
252	$self->{parent}	318	$self->{tooltip} = $tooltip;
253	or Carp::confess "no parent widget in _topleft\n";#d#
254		319
255	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	320	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		321	delete $CFClient::UI::TOOLTIP->{owner};
		322	CFClient::UI::check_tooltip;
		323	}
256	}	324	}
257		325
258	# translate global coordinates to local coordinate system	326	# translate global coordinates to local coordinate system
259	sub coord2local {	327	sub coord2local {
260	my ($self, $x, $y) = @_;	328	my ($self, $x, $y) = @_;
261		329
262	my ($X, $Y) = $self->_topleft;	330	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
263	($x - $X, $y - $Y)
264	}	331	}
265		332
266	# translate local coordinates to global coordinate system	333	# translate local coordinates to global coordinate system
267	sub coord2global {	334	sub coord2global {
268	my ($self, $x, $y) = @_;	335	my ($self, $x, $y) = @_;
269		336
270	my ($X, $Y) = $self->_topleft;	337	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
271	($x + $X, $y + $Y)
272	}	338	}
273		339
274	sub focus_in {	340	sub focus_in {
275	my ($self) = @_;	341	my ($self) = @_;
276		342
…		…
348	glVertex $self->{w}, 0;	414	glVertex $self->{w}, 0;
349	glVertex $self->{w}, $self->{h};	415	glVertex $self->{w}, $self->{h};
350	glVertex 0 , $self->{h};	416	glVertex 0 , $self->{h};
351	glEnd;	417	glEnd;
352	glPopMatrix;	418	glPopMatrix;
353	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	419	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
354	}	420	}
355	}	421	}
356		422
357	sub _draw {	423	sub _draw {
358	my ($self) = @_;	424	my ($self) = @_;
…		…
374		440
375	sub set_parent {	441	sub set_parent {
376	my ($self, $parent) = @_;	442	my ($self, $parent) = @_;
377		443
378	Scalar::Util::weaken ($self->{parent} = $parent);	444	Scalar::Util::weaken ($self->{parent} = $parent);
		445
		446	# TODO: req_w _does_change after ->reconfigure
		447	$self->check_size
		448	unless exists $self->{req_w};
		449
		450	$self->show;
379	}	451	}
380		452
381	sub check_size {	453	sub check_size {
382	my ($self) = @_;	454	my ($self, $forced) = @_;
383		455
384	$self->{parent}	456	$self->{force_alloc} = 1 if $forced;
385	or return 1;	457	$CFClient::UI::ROOT->{check_size}{$self} = $self;
386
387	my ($w, $h) = $self->{user_w} && $self->{user_h}
388	? @$self{qw(user_w user_h)}
389	: $self->size_request;
390
391	if ($w != $self->{req_w} || $h != $self->{req_h}) {
392	$self->{req_w} = $w;
393	$self->{req_h} = $h;
394
395	$self->{parent}->check_size
396	or $self->size_allocate (
397	(List::Util::max $self->{w}, $w),
398	(List::Util::max $self->{h}, $h),
399	);
400
401	1
402	} else {
403	0
404	}
405	}	458	}
406		459
407	sub update {	460	sub update {
408	my ($self) = @_;	461	my ($self) = @_;
409		462
…		…
424	}	477	}
425		478
426	sub DESTROY {	479	sub DESTROY {
427	my ($self) = @_;	480	my ($self) = @_;
428		481
		482	delete $WIDGET{$self+0};
429	#$self->deactivate;	483	#$self->deactivate;
430	}	484	}
431		485
432	#############################################################################	486	#############################################################################
433		487
…		…
442	my $class = shift;	496	my $class = shift;
443		497
444	# range [value, low, high, page]	498	# range [value, low, high, page]
445		499
446	$class->SUPER::new (	500	$class->SUPER::new (
447	bg => [0, 0, 0, 0.2],	501	#bg => [0, 0, 0, 0.2],
448	active_bg => [1, 1, 1, 0.5],	502	#active_bg => [1, 1, 1, 0.5],
449	@_	503	@_
450	)	504	)
451	}	505	}
452		506
453	sub _draw {	507	sub _draw {
454	my ($self) = @_;	508	my ($self) = @_;
455		509
		510	my $color = $FOCUS == $self && $self->{active_bg}
		511	? $self->{active_bg}
		512	: $self->{bg};
		513
		514	if ($color && (@$color < 4 || $color->[3])) {
456	my ($w, $h) = @$self{qw(w h)};	515	my ($w, $h) = @$self{qw(w h)};
457		516
458	glEnable GL_BLEND;	517	glEnable GL_BLEND;
459	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	518	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
460	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	519	glColor @$color;
461		520
462	glBegin GL_QUADS;	521	glBegin GL_QUADS;
463	glVertex 0 , 0;	522	glVertex 0 , 0;
464	glVertex 0 , $h;	523	glVertex 0 , $h;
465	glVertex $w, $h;	524	glVertex $w, $h;
466	glVertex $w, 0;	525	glVertex $w, 0;
467	glEnd;	526	glEnd;
468		527
469	glDisable GL_BLEND;	528	glDisable GL_BLEND;
		529	}
470	}	530	}
471		531
472	#############################################################################	532	#############################################################################
473		533
474	package CFClient::UI::Empty;	534	package CFClient::UI::Empty;
…		…
506		566
507	$self	567	$self
508	}	568	}
509		569
510	sub add {	570	sub add {
511	my ($self, $child) = @_;	571	my ($self, @widgets) = @_;
512		572
513	$child->set_parent ($self);	573	$_->set_parent ($self)
		574	for @widgets;
514		575
515	use sort 'stable';	576	use sort 'stable';
516		577
517	$self->{children} = [	578	$self->{children} = [
518	sort { $a->{z} <=> $b->{z} }	579	sort { $a->{z} <=> $b->{z} }
519	@{$self->{children}}, $child	580	@{$self->{children}}, @widgets
520	];	581	];
521		582
522	$child->check_size;	583	$self->check_size (1);
		584	$self->update;
		585	}
		586
		587	sub children {
		588	@{ $_[0]{children} }
523	}	589	}
524		590
525	sub remove {	591	sub remove {
526	my ($self, $child) = @_;	592	my ($self, $child) = @_;
527		593
…		…
542		608
543	for (@$children) {	609	for (@$children) {
544	delete $_->{parent};	610	delete $_->{parent};
545	$_->hide;	611	$_->hide;
546	}	612	}
		613
		614	$self->check_size;
		615	$self->update;
547	}	616	}
548		617
549	sub find_widget {	618	sub find_widget {
550	my ($self, $x, $y) = @_;	619	my ($self, $x, $y) = @_;
551		620
…		…
626	}	695	}
627		696
628	sub update {	697	sub update {
629	my ($self) = @_;	698	my ($self) = @_;
630		699
631	# we want to do this delayed...	700	$ROOT->on_post_alloc ($self => sub { $self->render_child });
632	$self->render_chld;
633	$self->SUPER::update;	701	$self->SUPER::update;
634	}
635
636	sub render_chld {
637	my ($self) = @_;
638
639	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
640	glClearColor 0, 0, 0, 1;
641	glClear GL_COLOR_BUFFER_BIT;
642	$self->child->draw;
643	};
644	}	702	}
645		703
646	sub size_allocate {	704	sub size_allocate {
647	my ($self, $w, $h) = @_;	705	my ($self, $w, $h) = @_;
648		706
649	$self->child->configure (0, 0, $w, $h);	707	$self->SUPER::size_allocate ($w, $h);
		708	$self->update;
		709	}
650		710
		711	sub _render {
		712	$_[0]{children}[0]->draw;
		713	}
		714
		715	sub render_child {
		716	my ($self) = @_;
		717
		718	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		719	glClearColor 0, 0, 0, 0;
		720	glClear GL_COLOR_BUFFER_BIT;
		721
651	$self->render_chld;	722	$self->_render;
		723	};
652	}	724	}
653		725
654	sub _draw {	726	sub _draw {
655	my ($self) = @_;	727	my ($self) = @_;
656		728
657	my ($w, $h) = ($self->w, $self->h);	729	my ($w, $h) = ($self->w, $self->h);
658		730
659	my $tex = $self->{texture}	731	my $tex = $self->{texture}
660	or return;	732	or return;
661		733
662	glEnable GL_BLEND;
663	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664	glEnable GL_TEXTURE_2D;	734	glEnable GL_TEXTURE_2D;
665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	735	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		736	glColor 1, 1, 1, 1;
666		737
667	$tex->draw_quad (0, 0, $w, $h);	738	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
668		739
669	glDisable GL_BLEND;
670	glDisable GL_TEXTURE_2D;	740	glDisable GL_TEXTURE_2D;
671	}	741	}
672		742
673	#############################################################################	743	#############################################################################
674		744
675	package CFClient::UI::ViewPort;	745	package CFClient::UI::ViewPort;
676		746
677	our @ISA = CFClient::UI::Window::;	747	our @ISA = CFClient::UI::Window::;
678		748
679	sub new { die }
680
681	sub size_request {	749	sub size_request {
682	my ($self) = @_;	750	my ($self) = @_;
683		751
684	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	752	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
685	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
686		753
687	@$self{qw(child_w child_h)}	754	@$self{qw(child_w child_h)}
688	}	755	}
689		756
690	sub _draw {	757	sub size_allocate {
691	my ($self) = @_;	758	my ($self, $w, $h) = @_;
692		759
693	$self->{children}[1]->draw;	760	my ($cw, $ch) = @$self{qw(child_w child_h)};
		761	# $w = $self->{w};
		762	$self->child->configure (0, 0, $cw, $ch);
		763	$self->update;
694	}	764	}
695		765
		766	sub set_offset {
		767	my ($self, $x, $y) = @_;
		768
		769	$self->{view_x} = int $x;
		770	$self->{view_y} = int $y;
		771
		772	$self->update;
		773	}
		774
		775	# hmm, this does not work for topleft of $self... but we should not ask for that
		776	sub coord2local {
		777	my ($self, $x, $y) = @_;
		778
		779	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		780	}
		781
		782	sub coord2global {
		783	my ($self, $x, $y) = @_;
		784
		785	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		786	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		787
		788	$self->SUPER::coord2global ($x, $y)
		789	}
		790
		791	sub find_widget {
		792	my ($self, $x, $y) = @_;
		793
		794	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		795	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		796	) {
		797	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		798	} else {
		799	$self->CFClient::UI::Base::find_widget ($x, $y)
		800	}
		801	}
		802
		803	sub _render {
		804	my ($self) = @_;
		805
		806	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		807
		808	$self->SUPER::_render;
		809	}
696		810
697	#############################################################################	811	#############################################################################
698		812
699	package CFClient::UI::Frame;	813	package CFClient::UI::ScrolledWindow;
700		814
701	our @ISA = CFClient::UI::Bin::;	815	our @ISA = CFClient::UI::HBox::;
702
703	use CFClient::OpenGL;
704		816
705	sub new {	817	sub new {
706	my $class = shift;	818	my $class = shift;
707		819
		820	my $self;
		821
		822	my $slider = new CFClient::UI::Slider
		823	vertical => 1,
		824	range => [0, 0, 1, 0.01], # HACK fix
		825	connect_changed => sub {
		826	$self->{vp}->set_offset (0, $_[1]);
		827	},
		828	;
		829
708	my $self = $class->SUPER::new (	830	$self = $class->SUPER::new (
709	bg => [1, 1, 1, 1],	831	vp => (new CFClient::UI::ViewPort expand => 1),
710	border_bg => [1, 1, 1, 1],	832	slider => $slider,
711	border => 0.8,
712	@_	833	@_,
713	);	834	);
714		835
		836	$self->{vp}->add ($self->{scrolled});
		837	$self->add ($self->{vp});
		838	$self->add ($self->{slider});
		839
715	$self	840	$self
716	}	841	}
717		842
		843	sub size_allocate {
		844	my ($self, $w, $h) = @_;
		845
		846	$self->SUPER::size_allocate ($w, $h);
		847
		848	my $child = $self->{vp}->child;
		849	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		850	}
		851
		852	#TODO# update range on size_allocate depending on child
		853	# update viewport offset on scroll
		854
		855	#############################################################################
		856
		857	package CFClient::UI::Frame;
		858
		859	our @ISA = CFClient::UI::Bin::;
		860
		861	use CFClient::OpenGL;
		862
		863	sub new {
		864	my $class = shift;
		865
		866	$class->SUPER::new (
		867	bg => undef,
		868	@_,
		869	)
		870	}
		871
718	sub _draw {	872	sub _draw {
719	my ($self) = @_;	873	my ($self) = @_;
720		874
721	my ($w, $h) = ($self->{w}, $self->{h});	875	if ($self->{bg}) {
		876	my ($w, $h) = @$self{qw(w h)};
722		877
723	glEnable GL_BLEND;	878	glEnable GL_BLEND;
724	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	879	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
725	glEnable GL_TEXTURE_2D;	880	glColor @{ $self->{bg} };
726	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
727		881
728	# glBegin GL_QUADS;	882	glBegin GL_QUADS;
729	# glColor 0, 0, 0, 0;
730	# glVertex 0 , 0;	883	glVertex 0 , 0;
731	# glVertex 0 , $h;	884	glVertex 0 , $h;
732	# glVertex $w, $h;	885	glVertex $w, $h;
733	# glVertex $w, 0;	886	glVertex $w, 0;
734	# glEnd;	887	glEnd;
735		888
736
737	$self->child->draw;
738	glDisable GL_BLEND;	889	glDisable GL_BLEND;
739	glDisable GL_TEXTURE_2D;	890	}
		891
		892	$self->SUPER::_draw;
740	}	893	}
741		894
742	#############################################################################	895	#############################################################################
743		896
744	package CFClient::UI::FancyFrame;	897	package CFClient::UI::FancyFrame;
…		…
755	my $class = shift;	908	my $class = shift;
756		909
757	# TODO: user_x, user_y, overwrite moveto?	910	# TODO: user_x, user_y, overwrite moveto?
758		911
759	my $self = $class->SUPER::new (	912	my $self = $class->SUPER::new (
760	bg => [1, 1, 1, 1],	913	bg => [1, 1, 1, 1],
761	border_bg => [1, 1, 1, 1],	914	border_bg => [1, 1, 1, 1],
762	border => 0.8,	915	border => 0.6,
		916	is_toplevel => 1,
763	can_events => 1,	917	can_events => 1,
764	@_	918	@_
765	);	919	);
766		920
767	$self->{title} &&= new CFClient::UI::Label	921	$self->{title} &&= new CFClient::UI::Label
768	align => 0,	922	align => 0,
769	valign => 1,	923	valign => 1,
770	text => $self->{title},	924	text => $self->{title},
771	fontsize => 1;	925	fontsize => $self->{border};
772		926
773	$self	927	$self
774	}	928	}
775		929
776	sub border {	930	sub border {
…		…
792	my ($self, $w, $h) = @_;	946	my ($self, $w, $h) = @_;
793		947
794	$h -= List::Util::max 0, $self->border * 2;	948	$h -= List::Util::max 0, $self->border * 2;
795	$w -= List::Util::max 0, $self->border * 2;	949	$w -= List::Util::max 0, $self->border * 2;
796		950
797	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	951	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
798	if $self->{title};	952	if $self->{title};
799		953
800	$self->child->configure ($self->border, $self->border, $w, $h);	954	$self->child->configure ($self->border, $self->border, $w, $h);
801	}	955	}
802		956
803	sub button_down {	957	sub button_down {
804	my ($self, $ev, $x, $y) = @_;	958	my ($self, $ev, $x, $y) = @_;
805		959
		960	my ($w, $h) = @$self{qw(w h)};
806	my $border = $self->border;	961	my $border = $self->border;
807		962
808	if ($x < $self->{w} && $x >= $self->{w} - $border	963	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809	&& $y < $self->{h} && $y >= $self->{h} - $border) {	964	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810		965
		966	if ($lr & $td) {
		967	my ($wx, $wy) = ($self->{x}, $self->{y});
811	my ($ox, $oy) = ($ev->{x}, $ev->{y});	968	my ($ox, $oy) = ($ev->{x}, $ev->{y});
812	my ($bw, $bh) = ($self->{w}, $self->{h});	969	my ($bw, $bh) = ($self->{w}, $self->{h});
813		970
		971	my $mx = $x < $border;
		972	my $my = $y < $border;
		973
814	$self->{motion} = sub {	974	$self->{motion} = sub {
815	my ($ev, $x, $y) = @_;	975	my ($ev, $x, $y) = @_;
816		976
817	($x, $y) = ($ev->{x}, $ev->{y});	977	my $dx = $ev->{x} - $ox;
		978	my $dy = $ev->{y} - $oy;
818		979
819	$self->{user_w} = $bw + $x - $ox;	980	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820	$self->{user_h} = $bh + $y - $oy;	981	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		982	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
821	$self->check_size;	983	$self->check_size;
822	};	984	};
823		985
824	} elsif ($x >= 0 && $x < $self->{w}	986	} elsif ($lr ^ $td) {
825	&& $y >= 0 && $y < $border) {
826
827	my ($ox, $oy) = ($ev->{x}, $ev->{y});	987	my ($ox, $oy) = ($ev->{x}, $ev->{y});
828	my ($bx, $by) = ($self->{x}, $self->{y});	988	my ($bx, $by) = ($self->{x}, $self->{y});
829		989
830	$self->{motion} = sub {	990	$self->{motion} = sub {
831	my ($ev, $x, $y) = @_;	991	my ($ev, $x, $y) = @_;
…		…
854	my ($self) = @_;	1014	my ($self) = @_;
855		1015
856	my ($w, $h ) = ($self->{w}, $self->{h});	1016	my ($w, $h ) = ($self->{w}, $self->{h});
857	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1017	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
858		1018
859	glEnable GL_BLEND;
860	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861	glEnable GL_TEXTURE_2D;	1019	glEnable GL_TEXTURE_2D;
862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1020	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
863		1021
864	my $border = $self->border;	1022	my $border = $self->border;
865		1023
866	glColor @{ $self->{border_bg} };	1024	glColor @{ $self->{border_bg} };
867	$tex[1]->draw_quad (0, 0, $w, $border);	1025	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
868	$tex[3]->draw_quad (0, $border, $border, $ch);	1026	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
869	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1027	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
870	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1028	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
871		1029
		1030	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872	my $bg = $tex[0];	1031	my $bg = $tex[0];
873		1032
874	# TODO: repeat texture not scale	1033	# TODO: repeat texture not scale
875	my $rep_x = $cw / $bg->{w};	1034	my $rep_x = $cw / $bg->{w};
876	my $rep_y = $ch / $bg->{h};	1035	my $rep_y = $ch / $bg->{h};
877		1036
878	glColor @{ $self->{bg} };	1037	glColor @{ $self->{bg} };
879		1038
880	$bg->{s} = $rep_x;	1039	$bg->{s} = $rep_x;
881	$bg->{t} = $rep_y;	1040	$bg->{t} = $rep_y;
882	$bg->{wrap_mode} = 1;	1041	$bg->{wrap_mode} = 1;
883	$bg->draw_quad ($border, $border, $cw, $ch);	1042	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1043	}
884		1044
885	glDisable GL_TEXTURE_2D;	1045	glDisable GL_TEXTURE_2D;
886	glDisable GL_BLEND;
887		1046
888	$self->{title}->draw if $self->{title};	1047	$self->{title}->draw if $self->{title};
		1048
889	$self->child->draw;	1049	$self->child->draw;
890	}	1050	}
891		1051
892	#############################################################################	1052	#############################################################################
893		1053
…		…
915	$self->{children}[$y][$x] = $child;	1075	$self->{children}[$y][$x] = $child;
916		1076
917	$child->check_size;	1077	$child->check_size;
918	}	1078	}
919		1079
		1080	sub children {
		1081	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1082	}
		1083
920	# TODO: move to container class maybe? send childs a signal on removal?	1084	# TODO: move to container class maybe? send childs a signal on removal?
921	sub clear {	1085	sub clear {
922	my ($self) = @_;	1086	my ($self) = @_;
923		1087
924	my $children = delete $self->{children};	1088	my @children = $self->children;
		1089	delete $self->{children};
925		1090
926	for (grep $_, map @$_, grep $_, @$children) {	1091	for (@children) {
927	delete $_->{parent};	1092	delete $_->{parent};
928	$_->hide;	1093	$_->hide;
929	}	1094	}
930		1095
931	$self->update;	1096	$self->update;
…		…
1112	}	1277	}
1113		1278
1114	sub size_allocate {	1279	sub size_allocate {
1115	my ($self, $w, $h) = @_;	1280	my ($self, $w, $h) = @_;
1116		1281
		1282	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1283
1117	my $children = $self->{children};	1284	my $children = $self->{children};
1118		1285
1119	my @h = map $_->{req_h}, @$children;	1286	my @h = map $_->{req_h}, @$children;
1120		1287
1121	my $req_h = List::Util::sum @h;	1288	my $req_h = List::Util::sum @h;
…		…
1150		1317
1151	#############################################################################	1318	#############################################################################
1152		1319
1153	package CFClient::UI::Label;	1320	package CFClient::UI::Label;
1154		1321
1155	our @ISA = CFClient::UI::Base::;	1322	our @ISA = CFClient::UI::DrawBG::;
1156		1323
1157	use CFClient::OpenGL;	1324	use CFClient::OpenGL;
1158		1325
1159	sub new {	1326	sub new {
1160	my ($class, %arg) = @_;	1327	my ($class, %arg) = @_;
1161		1328
1162	my $self = $class->SUPER::new (	1329	my $self = $class->SUPER::new (
1163	fg => [1, 1, 1],	1330	fg => [1, 1, 1],
		1331	#bg => none
		1332	#active_bg => none
1164	#font => default_font	1333	#font => default_font
		1334	#text => initial text
		1335	#markup => initial narkup
		1336	#max_w => maximum pixel width
		1337	ellipsise => 3, # end
		1338	layout => (new CFClient::Layout),
1165	fontsize => 1,	1339	fontsize => 1,
1166	text => "",
1167	align => -1,	1340	align => -1,
1168	valign => -1,	1341	valign => -1,
1169	padding => 2,	1342	padding => 2,
1170	layout => new CFClient::Layout,
1171	can_events => 0,	1343	can_events => 0,
1172	%arg	1344	%arg
1173	);	1345	);
1174		1346
1175	if (exists $self->{template}) {	1347	if (exists $self->{template}) {
1176	my $layout = new CFClient::Layout;	1348	my $layout = new CFClient::Layout;
1177	$layout->set_text (delete $self->{template});	1349	$layout->set_text (delete $self->{template});
1178	$self->{template} = $layout;	1350	$self->{template} = $layout;
1179	}	1351	}
1180		1352
1181	$self->set_text (delete $self->{text}) if exists $self->{text};	1353	if (exists $self->{markup}) {
1182	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1354	$self->set_markup (delete $self->{markup});
		1355	} else {
		1356	$self->set_text (delete $self->{text});
		1357	}
1183		1358
1184	$self	1359	$self
1185	}	1360	}
1186		1361
1187	sub escape {	1362	sub escape($) {
1188	local $_ = $_[1];	1363	local $_ = $_[0];
1189		1364
1190	s/&/&amp;/g;	1365	s/&/&amp;/g;
1191	s/>/&gt;/g;	1366	s/>/&gt;/g;
1192	s/</&lt;/g;	1367	s/</&lt;/g;
1193		1368
1194	$_[1]	1369	$_
		1370	}
		1371
		1372	sub update {
		1373	my ($self) = @_;
		1374
		1375	delete $self->{texture};
		1376	$self->SUPER::update;
1195	}	1377	}
1196		1378
1197	sub set_text {	1379	sub set_text {
1198	my ($self, $text) = @_;	1380	my ($self, $text) = @_;
1199		1381
		1382	return if $self->{text} eq "T$text";
		1383	$self->{text} = "T$text";
		1384
		1385	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1200	$self->{layout}->set_text ($text);	1386	$self->{layout}->set_text ($text);
1201		1387
1202	delete $self->{texture};	1388	$self->update;
1203	$self->check_size;	1389	$self->check_size;
1204	$self->update;
1205	}	1390	}
1206		1391
1207	sub set_markup {	1392	sub set_markup {
1208	my ($self, $markup) = @_;	1393	my ($self, $markup) = @_;
1209		1394
		1395	return if $self->{text} eq "M$markup";
		1396	$self->{text} = "M$markup";
		1397
		1398	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1399
		1400	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1210	$self->{layout}->set_markup ($markup);	1401	$self->{layout}->set_markup ($markup);
1211		1402
1212	delete $self->{texture};	1403	$self->update;
1213	$self->check_size;	1404	$self->check_size;
1214	$self->update;
1215	}	1405	}
1216		1406
1217	sub size_request {	1407	sub size_request {
1218	my ($self) = @_;	1408	my ($self) = @_;
1219		1409
1220	$self->{layout}->set_font ($self->{font}) if $self->{font};	1410	$self->{layout}->set_font ($self->{font}) if $self->{font};
1221	$self->{layout}->set_width ($self->{max_w} || -1);	1411	$self->{layout}->set_width ($self->{max_w} || -1);
		1412	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1413	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1222	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1414	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1223		1415
1224	my ($w, $h) = $self->{layout}->size;	1416	my ($w, $h) = $self->{layout}->size;
1225		1417
1226	if (exists $self->{template}) {	1418	if (exists $self->{template}) {
…		…
1248	sub set_fontsize {	1440	sub set_fontsize {
1249	my ($self, $fontsize) = @_;	1441	my ($self, $fontsize) = @_;
1250		1442
1251	$self->{fontsize} = $fontsize;	1443	$self->{fontsize} = $fontsize;
1252	delete $self->{texture};	1444	delete $self->{texture};
		1445
		1446	$self->update;
1253	$self->check_size;	1447	$self->check_size;
1254	$self->update;
1255	}	1448	}
1256		1449
1257	sub _draw {	1450	sub _draw {
1258	my ($self) = @_;	1451	my ($self) = @_;
1259		1452
		1453	$self->SUPER::_draw; # draw background, if applicable
		1454
1260	my $tex = $self->{texture} ||= do {	1455	my $tex = $self->{texture} ||= do {
		1456	$self->{layout}->set_foreground (@{$self->{fg}});
1261	$self->{layout}->set_font ($self->{font}) if $self->{font};	1457	$self->{layout}->set_font ($self->{font}) if $self->{font};
1262	$self->{layout}->set_width ($self->{w});	1458	$self->{layout}->set_width ($self->{w});
		1459	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1460	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1263	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1461	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1462
1264	new_from_layout CFClient::Texture $self->{layout}	1463	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1464
		1465	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1466	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1467	: ($self->{w} - $tex->{w}) * 0.5);
		1468
		1469	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1470	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1471	: ($self->{h} - $tex->{h}) * 0.5);
		1472
		1473	$tex
1265	};	1474	};
1266		1475
1267	glEnable GL_BLEND;
1268	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1269	glEnable GL_TEXTURE_2D;	1476	glEnable GL_TEXTURE_2D;
1270	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1477	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1271		1478
		1479	if ($tex->{format} == GL_ALPHA) {
1272	glColor @{$self->{fg}};	1480	glColor @{$self->{fg}};
1273
1274	$self->{ox} = int (
1275	$self->{align} < 0 ? $self->{padding}
1276	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1277	: ($self->{w} - $tex->{w}) * 0.5
1278	);
1279
1280	$self->{oy} = int (
1281	$self->{valign} < 0 ? $self->{padding}
1282	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1283	: ($self->{h} - $tex->{h}) * 0.5
1284	);
1285
1286	$tex->draw_quad ($self->{ox}, $self->{oy});	1481	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1482	} else {
		1483	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1484	}
1287		1485
1288	glDisable GL_TEXTURE_2D;	1486	glDisable GL_TEXTURE_2D;
1289	glDisable GL_BLEND;
1290	}	1487	}
1291		1488
1292	#############################################################################	1489	#############################################################################
1293		1490
1294	package CFClient::UI::EntryBase;	1491	package CFClient::UI::EntryBase;
…		…
1307	active_fg => [0, 0, 0],	1504	active_fg => [0, 0, 0],
1308	can_hover => 1,	1505	can_hover => 1,
1309	can_focus => 1,	1506	can_focus => 1,
1310	valign => 0,	1507	valign => 0,
1311	can_events => 1,	1508	can_events => 1,
		1509	#text => ...
1312	@_	1510	@_
1313	)	1511	)
1314	}	1512	}
1315		1513
1316	sub _set_text {	1514	sub _set_text {
…		…
1327		1525
1328	$text =~ s/./*/g if $self->{hidden};	1526	$text =~ s/./*/g if $self->{hidden};
1329	$self->{layout}->set_text ("$text ");	1527	$self->{layout}->set_text ("$text ");
1330		1528
1331	$self->emit (changed => $self->{text});	1529	$self->emit (changed => $self->{text});
1332	}
1333
1334	sub get_text {
1335	$_[0]{text}
1336	}
1337
1338	sub size_request {
1339	my ($self) = @_;
1340
1341	my ($w, $h) = $self->SUPER::size_request;
1342
1343	($w + 1, $h) # add 1 for cursor
1344	}
1345
1346	sub size_allocate {
1347	my ($self, $w, $h) = @_;
1348
1349	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1350	}	1530	}
1351		1531
1352	sub set_text {	1532	sub set_text {
1353	my ($self, $text) = @_;	1533	my ($self, $text) = @_;
1354		1534
1355	$self->{cursor} = length $text;	1535	$self->{cursor} = length $text;
1356	$self->_set_text ($text);	1536	$self->_set_text ($text);
1357	$self->update;	1537	$self->update;
		1538	$self->check_size;
		1539	}
		1540
		1541	sub get_text {
		1542	$_[0]{text}
		1543	}
		1544
		1545	sub size_request {
		1546	my ($self) = @_;
		1547
		1548	my ($w, $h) = $self->SUPER::size_request;
		1549
		1550	($w + 1, $h) # add 1 for cursor
		1551	}
		1552
		1553	sub size_allocate {
		1554	my ($self, $w, $h) = @_;
		1555
		1556	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1358	}	1557	}
1359		1558
1360	sub key_down {	1559	sub key_down {
1361	my ($self, $ev) = @_;	1560	my ($self, $ev) = @_;
1362		1561
…		…
1364	my $sym = $ev->{sym};	1563	my $sym = $ev->{sym};
1365	my $uni = $ev->{unicode};	1564	my $uni = $ev->{unicode};
1366		1565
1367	my $text = $self->get_text;	1566	my $text = $self->get_text;
1368		1567
1369	if ($sym == 8) {	1568	if ($uni == 8) {
1370	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1569	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1371	} elsif ($sym == 127) {	1570	} elsif ($uni == 127) {
1372	substr $text, $self->{cursor}, 1, "";	1571	substr $text, $self->{cursor}, 1, "";
1373	} elsif ($sym == CFClient::SDLK_LEFT) {	1572	} elsif ($sym == CFClient::SDLK_LEFT) {
1374	--$self->{cursor} if $self->{cursor};	1573	--$self->{cursor} if $self->{cursor};
1375	} elsif ($sym == CFClient::SDLK_RIGHT) {	1574	} elsif ($sym == CFClient::SDLK_RIGHT) {
1376	++$self->{cursor} if $self->{cursor} < length $self->{text};	1575	++$self->{cursor} if $self->{cursor} < length $self->{text};
1377	} elsif ($sym == CFClient::SDLK_HOME) {	1576	} elsif ($sym == CFClient::SDLK_HOME) {
1378	$self->{cursor} = 0;	1577	$self->{cursor} = 0;
1379	} elsif ($sym == CFClient::SDLK_END) {	1578	} elsif ($sym == CFClient::SDLK_END) {
1380	$self->{cursor} = length $text;	1579	$self->{cursor} = length $text;
1381	} elsif ($sym == 27) {	1580	} elsif ($uni == 27) {
1382	$self->emit ('escape');	1581	$self->emit ('escape');
1383	} elsif ($uni) {	1582	} elsif ($uni) {
1384	substr $text, $self->{cursor}++, 0, chr $uni;	1583	substr $text, $self->{cursor}++, 0, chr $uni;
1385	}	1584	}
1386		1585
1387	$self->_set_text ($text);	1586	$self->_set_text ($text);
1388	$self->update;	1587	$self->update;
		1588	$self->check_size;
1389	}	1589	}
1390		1590
1391	sub focus_in {	1591	sub focus_in {
1392	my ($self) = @_;	1592	my ($self) = @_;
1393		1593
…		…
1522	my $class = shift;	1722	my $class = shift;
1523		1723
1524	$class->SUPER::new (	1724	$class->SUPER::new (
1525	padding => 4,	1725	padding => 4,
1526	fg => [1, 1, 1],	1726	fg => [1, 1, 1],
1527	bg => [1, 1, 1, 0.2],
1528	active_fg => [0, 0, 1],	1727	active_fg => [0, 0, 1],
1529	can_hover => 1,	1728	can_hover => 1,
1530	align => 0,	1729	align => 0,
1531	valign => 0,	1730	valign => 0,
1532	can_events => 1,	1731	can_events => 1,
…		…
1550		1749
1551	if ($GRAB == $self) {	1750	if ($GRAB == $self) {
1552	$self->{fg} = $self->{active_fg};	1751	$self->{fg} = $self->{active_fg};
1553	}	1752	}
1554		1753
1555	glEnable GL_BLEND;
1556	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1557	glEnable GL_TEXTURE_2D;	1754	glEnable GL_TEXTURE_2D;
1558	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1755	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559	glColor 0, 0, 0, 1;	1756	glColor 0, 0, 0, 1;
1560		1757
1561	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1758	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1562		1759
1563	glDisable GL_TEXTURE_2D;	1760	glDisable GL_TEXTURE_2D;
1564	glDisable GL_BLEND;
1565		1761
1566	$self->SUPER::_draw;	1762	$self->SUPER::_draw;
1567	}	1763	}
1568		1764
1569	#############################################################################	1765	#############################################################################
…		…
1583		1779
1584	$class->SUPER::new (	1780	$class->SUPER::new (
1585	padding => 2,	1781	padding => 2,
1586	fg => [1, 1, 1],	1782	fg => [1, 1, 1],
1587	active_fg => [1, 1, 0],	1783	active_fg => [1, 1, 0],
		1784	bg => [0, 0, 0, 0.2],
		1785	active_bg => [1, 1, 1, 0.5],
1588	state => 0,	1786	state => 0,
1589	can_hover => 1,	1787	can_hover => 1,
1590	@_	1788	@_
1591	)	1789	)
1592	}	1790	}
…		…
1616		1814
1617	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1815	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1618		1816
1619	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1817	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1620		1818
1621	glEnable GL_BLEND;	1819	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1820
1622	glEnable GL_TEXTURE_2D;	1821	glEnable GL_TEXTURE_2D;
1623	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1624
1625	my $tex = $self->{state} ? $tex[1] : $tex[0];
1626
1627	$tex->draw_quad (0, 0, $s, $s);	1822	$tex->draw_quad_alpha (0, 0, $s, $s);
1628
1629	glDisable GL_TEXTURE_2D;	1823	glDisable GL_TEXTURE_2D;
1630	glDisable GL_BLEND;
1631	}	1824	}
1632		1825
1633	#############################################################################	1826	#############################################################################
1634		1827
1635	package CFClient::UI::Image;	1828	package CFClient::UI::Image;
…		…
1678	glTranslate 0, -$self->{w}, 0;	1871	glTranslate 0, -$self->{w}, 0;
1679		1872
1680	($w, $h) = ($h, $w);	1873	($w, $h) = ($h, $w);
1681	}	1874	}
1682		1875
1683	glEnable GL_BLEND;
1684	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685	glEnable GL_TEXTURE_2D;	1876	glEnable GL_TEXTURE_2D;
1686	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1877	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1687		1878
1688	$tex->draw_quad (0, 0, $w, $h);	1879	$tex->draw_quad_alpha (0, 0, $w, $h);
1689		1880
1690	glDisable GL_BLEND;
1691	glDisable GL_TEXTURE_2D;	1881	glDisable GL_TEXTURE_2D;
1692	}	1882	}
1693		1883
1694	#############################################################################	1884	#############################################################################
1695		1885
…		…
1743	}	1933	}
1744		1934
1745	sub set_max {	1935	sub set_max {
1746	my ($self, $max) = @_;	1936	my ($self, $max) = @_;
1747		1937
		1938	return if $self->{max_val} == $max;
		1939
1748	$self->{max_val} = $max;	1940	$self->{max_val} = $max;
		1941	$self->update;
1749	}	1942	}
1750		1943
1751	sub set_value {	1944	sub set_value {
1752	my ($self, $val, $max) = @_;	1945	my ($self, $val, $max) = @_;
1753		1946
1754	$self->set_max ($max)	1947	$self->set_max ($max)
1755	if defined $max;	1948	if defined $max;
1756		1949
1757	$max = $self->{max_val};	1950	return if $self->{val} == $val;
		1951
1758	$self->{val} = $val;	1952	$self->{val} = $val;
1759
1760	$self->update;	1953	$self->update;
1761	}	1954	}
1762		1955
1763	sub _draw {	1956	sub _draw {
1764	my ($self) = @_;	1957	my ($self) = @_;
…		…
1847		2040
1848	$self->{value}->set_fontsize ($fsize);	2041	$self->{value}->set_fontsize ($fsize);
1849	$self->{max} ->set_fontsize ($fsize);	2042	$self->{max} ->set_fontsize ($fsize);
1850	}	2043	}
1851		2044
		2045	sub set_max {
		2046	my ($self, $max) = @_;
		2047
		2048	$self->{gauge}->set_max ($max);
		2049	$self->{max}->set_text ($max);
		2050	}
		2051
1852	sub set_value {	2052	sub set_value {
1853	my ($self, $val, $max) = @_;	2053	my ($self, $val, $max) = @_;
1854		2054
1855	$self->set_max ($max)	2055	$self->set_max ($max)
1856	if defined $max;	2056	if defined $max;
1857		2057
1858	$self->{gauge}->set_value ($val, $max);	2058	$self->{gauge}->set_value ($val, $max);
1859	$self->{value}->set_text ($val);	2059	$self->{value}->set_text ($val);
1860	}
1861
1862	sub set_max {
1863	my ($self, $max) = @_;
1864
1865	$self->{gauge}->set_max ($max);
1866	$self->{max}->set_text ($max);
1867	}	2060	}
1868		2061
1869	#############################################################################	2062	#############################################################################
1870		2063
1871	package CFClient::UI::Slider;	2064	package CFClient::UI::Slider;
…		…
1881	qw(s1_slider.png s1_slider_bg.png);	2074	qw(s1_slider.png s1_slider_bg.png);
1882		2075
1883	sub new {	2076	sub new {
1884	my $class = shift;	2077	my $class = shift;
1885		2078
1886	# range [value, low, high, page]	2079	# range [value, low, high, page, unit]
1887		2080
1888	# TODO: 0-width page	2081	# TODO: 0-width page
1889	# TODO: req_w/h are wrong with vertical	2082	# TODO: req_w/h are wrong with vertical
1890	# TODO: calculations are off	2083	# TODO: calculations are off
1891	my $self = $class->SUPER::new (	2084	my $self = $class->SUPER::new (
1892	fg => [1, 1, 1],	2085	fg => [1, 1, 1],
1893	active_fg => [0, 0, 0],	2086	active_fg => [0, 0, 0],
		2087	bg => [0, 0, 0, 0.2],
		2088	active_bg => [1, 1, 1, 0.5],
1894	range => [0, 0, 100, 10],	2089	range => [0, 0, 100, 10, 0],
1895	req_w => 20,	2090	req_w => $::WIDTH / 80,
1896	req_h => 20,	2091	req_h => $::WIDTH / 80,
1897	vertical => 0,	2092	vertical => 0,
1898	can_hover => 1,	2093	can_hover => 1,
1899	inner_pad => 5,	2094	inner_pad => 0.02,
1900	@_	2095	@_
1901	);	2096	);
1902		2097
		2098	$self->set_value ($self->{range}[0]);
		2099	$self->update;
		2100
1903	$self	2101	$self
		2102	}
		2103
		2104	sub set_range {
		2105	my ($self, $range) = @_;
		2106
		2107	$self->{range} = $range;
		2108
		2109	$self->update;
		2110	}
		2111
		2112	sub set_value {
		2113	my ($self, $value) = @_;
		2114
		2115	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2116
		2117	$hi = $lo + 1 if $hi <= $lo;
		2118
		2119	$page = $hi - $lo if $page > $hi - $lo;
		2120
		2121	$value = $lo if $value < $lo;
		2122	$value = $hi - $page if $value > $hi - $page;
		2123
		2124	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2125	if $unit;
		2126
		2127	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2128
		2129	if ($value != $old_value) {
		2130	$self->emit (changed => $value);
		2131	$self->update;
		2132	}
1904	}	2133	}
1905		2134
1906	sub size_request {	2135	sub size_request {
1907	my ($self) = @_;	2136	my ($self) = @_;
1908		2137
…		…
1914		2143
1915	sub button_down {	2144	sub button_down {
1916	my ($self, $ev, $x, $y) = @_;	2145	my ($self, $ev, $x, $y) = @_;
1917		2146
1918	$self->SUPER::button_down ($ev, $x, $y);	2147	$self->SUPER::button_down ($ev, $x, $y);
		2148
		2149	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2150
1919	$self->mouse_motion ($ev, $x, $y);	2151	$self->mouse_motion ($ev, $x, $y);
1920	}	2152	}
1921		2153
1922	sub mouse_motion {	2154	sub mouse_motion {
1923	my ($self, $ev, $x, $y) = @_;	2155	my ($self, $ev, $x, $y) = @_;
1924		2156
1925	if ($GRAB == $self) {	2157	if ($GRAB == $self) {
		2158	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2159
		2160	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2161
		2162	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2163
		2164	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2165	}
		2166	}
		2167
		2168	sub update {
		2169	my ($self) = @_;
		2170
		2171	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2172	$self->set_value ($self->{range}[0]);
		2173
1926	my ($value, $lo, $hi, $page) = @{$self->{range}};	2174	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2175	my $range = ($hi - $page - $lo) || 1e-100;
1927		2176
1928	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2177	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1929		2178
1930	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2179	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1931	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2180	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1932		2181
1933	$x -= $inner_pad_px; # substract the padding	2182	$value = ($value - $lo) / $range;
1934	$x = $x * ($hi - $lo) / $inner_w + $lo;	2183	$value = $value * $self->{scale} + $self->{offset};
1935	$x = $lo if $x < $lo;
1936	$x = $hi - $page if $x > $hi - $page;
1937	$self->{range}[0] = $x;
1938		2184
1939	$self->emit (changed => $x);	2185	$self->{knob_x} = $value - $knob_w * 0.5;
1940	$self->update;	2186	$self->{knob_w} = $knob_w;
1941	}	2187	});
1942	}
1943		2188
1944	# the inner_* stuff is for generating a padding for the slider handle,	2189	$self->SUPER::update;
1945	# so that the handle doesn't leave the texture. This calculation isn't 100%
1946	# correct propably, but it does the job for now
1947	sub _calc_inner_pad_px {
1948	my ($self, $w) = @_;
1949	($w / 100) * $self->{inner_pad} # % to pixels
1950	}	2190	}
1951		2191
1952	sub _draw {	2192	sub _draw {
1953	my ($self) = @_;	2193	my ($self) = @_;
1954		2194
1955	$self->SUPER::_draw ();	2195	$self->SUPER::_draw ();
1956		2196
1957	my ($w, $h) = @$self{qw(w h)};	2197	glScale $self->{w}, $self->{h};
1958		2198
1959	if ($self->{vertical}) {	2199	if ($self->{vertical}) {
1960	# draw a vertical slider like a rotated horizontal slider	2200	# draw a vertical slider like a rotated horizontal slider
1961		2201
		2202	glTranslate 1, 0, 0;
1962	glRotate 90, 0, 0, 1;	2203	glRotate 90, 0, 0, 1;
1963	glTranslate 0, -$self->{w}, 0;
1964
1965	($w, $h) = ($h, $w);
1966	}	2204	}
1967		2205
1968	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2206	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1969	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2207	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1970		2208
1971	my ($value, $lo, $hi, $page) = @{$self->{range}};
1972
1973	$hi = $value + 1 if $lo == $hi;
1974
1975	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1976	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1977
1978	$page = int $page * $inner_w / ($hi - $lo);
1979	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1980
1981	$w -= $page;
1982	$page &= ~1;
1983	glTranslate $page * 0.5, 0, 0;
1984	$page ||= 2;
1985
1986	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1987	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1988
1989	glEnable GL_BLEND;
1990	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1991	glEnable GL_TEXTURE_2D;	2209	glEnable GL_TEXTURE_2D;
1992	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1993		2211
1994	# draw background	2212	# draw background
1995	$tex[1]->draw_quad (0, 0, $w, $h);	2213	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1996		2214
1997	# draw handle	2215	# draw handle
1998	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2216	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1999		2217
2000	glDisable GL_BLEND;
2001	glDisable GL_TEXTURE_2D;	2218	glDisable GL_TEXTURE_2D;
2002	}	2219	}
		2220
		2221	#############################################################################
		2222
		2223	package CFClient::UI::ValSlider;
		2224
		2225	our @ISA = CFClient::UI::HBox::;
		2226
		2227	sub new {
		2228	my ($class, %arg) = @_;
		2229
		2230	my $range = delete $arg{range};
		2231
		2232	my $self = $class->SUPER::new (
		2233	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2234	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2235	to_value => sub { shift },
		2236	from_value => sub { shift },
		2237	%arg,
		2238	);
		2239
		2240	$self->{slider}->connect (changed => sub {
		2241	my ($self, $value) = @_;
		2242	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2243	$self->{parent}->emit (changed => $value);
		2244	});
		2245
		2246	# $self->{entry}->connect (changed => sub {
		2247	# my ($self, $value) = @_;
		2248	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2249	# $self->{parent}->emit (changed => $value);
		2250	# });
		2251
		2252	$self->add ($self->{slider}, $self->{entry});
		2253
		2254	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2255
		2256	$self
		2257	}
		2258
		2259	sub set_range { shift->{slider}->set_range (@_) }
		2260	sub set_value { shift->{slider}->set_value (@_) }
2003		2261
2004	#############################################################################	2262	#############################################################################
2005		2263
2006	package CFClient::UI::TextView;	2264	package CFClient::UI::TextView;
2007		2265
…		…
2016	fontsize => 1,	2274	fontsize => 1,
2017	can_events => 0,	2275	can_events => 0,
2018	#font => default_font	2276	#font => default_font
2019	@_,	2277	@_,
2020		2278
2021	layout => (new CFClient::Layout),	2279	layout => (new CFClient::Layout 1),
2022	par => [],	2280	par => [],
2023	height => 0,	2281	height => 0,
2024	children => [	2282	children => [
2025	(new CFClient::UI::Empty expand => 1),	2283	(new CFClient::UI::Empty expand => 1),
2026	(new CFClient::UI::Slider vertical => 1),	2284	(new CFClient::UI::Slider vertical => 1),
2027	],	2285	],
2028	);	2286	);
2029		2287
2030	$self->{children}[1]->connect (changed => sub {	2288	$self->{children}[1]->connect (changed => sub { $self->update });
2031	$self->update;
2032	});
2033		2289
2034	$self	2290	$self
2035	}	2291	}
2036		2292
2037	sub set_fontsize {	2293	sub set_fontsize {
2038	my ($self, $fontsize) = @_;	2294	my ($self, $fontsize) = @_;
2039		2295
2040	$self->{fontsize} = $fontsize;	2296	$self->{fontsize} = $fontsize;
2041	$self->reflow;	2297	$self->reflow;
2042	}
2043
2044	sub text_height {
2045	my ($self, $text) = @_;
2046
2047	my $layout = $self->{layout};
2048
2049	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2050	$layout->set_width ($self->{w});
2051	$layout->set_text ($text);
2052
2053	($layout->size)[1]
2054	}
2055
2056	sub reflow {
2057	my ($self) = @_;
2058
2059	$self->{need_reflow}++;
2060	$self->update;
2061	}	2298	}
2062		2299
2063	sub size_allocate {	2300	sub size_allocate {
2064	my ($self, $w, $h) = @_;	2301	my ($self, $w, $h) = @_;
2065		2302
…		…
2070	$self->{layout}->set_width ($self->{children}[0]{w});	2307	$self->{layout}->set_width ($self->{children}[0]{w});
2071		2308
2072	$self->reflow;	2309	$self->reflow;
2073	}	2310	}
2074		2311
		2312	sub text_size {
		2313	my ($self, $text, $indent) = @_;
		2314
		2315	my $layout = $self->{layout};
		2316
		2317	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2318	$layout->set_width ($self->{children}[0]{w} - $indent);
		2319	$layout->set_markup ($text);
		2320
		2321	$layout->size
		2322	}
		2323
		2324	sub reflow {
		2325	my ($self) = @_;
		2326
		2327	$self->{need_reflow}++;
		2328	$self->update;
		2329	}
		2330
		2331	sub set_offset {
		2332	my ($self, $offset) = @_;
		2333
		2334	# todo: base offset on lines or so, not on pixels
		2335	$self->{children}[1]->set_value ($offset);
		2336	}
		2337
		2338	sub clear {
		2339	my ($self) = @_;
		2340
		2341	$self->{par} = [];
		2342	$self->{height} = 0;
		2343	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2344	}
		2345
2075	sub add_paragraph {	2346	sub add_paragraph {
2076	my ($self, $color, $text) = @_;	2347	my ($self, $color, $text, $indent) = @_;
2077		2348
2078	#TODO: intelligently "reformat" paragraph	2349	for my $line (split /\n/, $text) {
2079		2350	my ($w, $h) = $self->text_size ($line);
2080	my $height = $self->text_height ($text);
2081
2082	$self->{height} += $height;	2351	$self->{height} += $h;
		2352	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2353	}
2083		2354
2084	push @{$self->{par}}, [$height, $color, $text];
2085
2086	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2355	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2087	$self->{children}[1]->update;
2088	}	2356	}
2089		2357
2090	sub update {	2358	sub update {
2091	my ($self) = @_;	2359	my ($self) = @_;
2092		2360
…		…
2094		2362
2095	return unless $self->{h} > 0;	2363	return unless $self->{h} > 0;
2096		2364
2097	delete $self->{texture};	2365	delete $self->{texture};
2098		2366
2099	$ROOT->on_refresh ($self, sub {	2367	$ROOT->on_post_alloc ($self, sub {
		2368	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2369
2100	if (delete $self->{need_reflow}) {	2370	if (delete $self->{need_reflow}) {
2101	my $height = 0;	2371	my $height = 0;
2102		2372
2103	$height += $_->[0] = $self->text_height ($_->[2])	2373	my $layout = $self->{layout};
		2374
		2375	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2376
2104	for @{$self->{par}};	2377	for (@{$self->{par}}) {
		2378	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2379	$layout->set_width ($W - $_->[3]);
		2380	$layout->set_markup ($_->[4]);
		2381	my ($w, $h) = $layout->size;
		2382	$_->[0] = $w + $_->[3];
		2383	$_->[1] = $h;
		2384	}
		2385
		2386	$height += $_->[1];
		2387	}
2105		2388
2106	$self->{height} = $height;	2389	$self->{height} = $height;
2107		2390
2108	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2391	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2109		2392
2110	delete $self->{texture};	2393	delete $self->{texture};
2111	}	2394	}
2112		2395
2113	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2396	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2114	glClearColor 0, 0, 0, 1;	2397	glClearColor 0.5, 0.5, 0.5, 0;
2115	glClear GL_COLOR_BUFFER_BIT;	2398	glClear GL_COLOR_BUFFER_BIT;
2116		2399
		2400	my $top = int $self->{children}[1]{range}[0];
		2401
		2402	my $y0 = $top;
		2403	my $y1 = $top + $H;
		2404
		2405	my $y = 0;
		2406
		2407	my $layout = $self->{layout};
		2408
		2409	$layout->set_font ($self->{font}) if $self->{font};
		2410
2117	glEnable GL_BLEND;	2411	glEnable GL_BLEND;
		2412	#TODO# not correct in windows where rgba is forced off
2118	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2413	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2119	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121
2122	my $top = int $self->{children}[1]{range}[0];
2123
2124	my $y0 = $top;
2125	my $y1 = $top + $self->{h};
2126
2127	my $y = 0;
2128
2129	my $layout = $self->{layout};
2130
2131	$layout->set_font ($self->{font}) if $self->{font};
2132		2414
2133	for my $par (@{$self->{par}}) {	2415	for my $par (@{$self->{par}}) {
2134	my $h = $par->[0];	2416	my $h = $par->[1];
2135		2417
2136	if ($y0 < $y + $h && $y < $y1) {	2418	if ($y0 < $y + $h && $y < $y1) {
		2419	$layout->set_foreground (@{ $par->[2] });
		2420	$layout->set_width ($W - $par->[3]);
2137	$layout->set_text ($par->[2]);	2421	$layout->set_markup ($par->[4]);
2138		2422
2139	glColor @{ $par->[1] };	2423	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2140	my ($W, $H) = $layout->size;	2424
2141	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2425	glRasterPos $par->[3], $y - $y0;
		2426	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2142	}	2427	}
2143		2428
2144	$y += $h;	2429	$y += $h;
2145	}	2430	}
2146		2431
2147	glDisable GL_TEXTURE_2D;
2148	glDisable GL_BLEND;	2432	glDisable GL_BLEND;
2149	};	2433	};
2150	});	2434	});
2151	}	2435	}
2152		2436
2153	sub _draw {	2437	sub _draw {
2154	my ($self) = @_;	2438	my ($self) = @_;
2155		2439
2156	if ($self->{texture}) {
2157	glEnable GL_TEXTURE_2D;	2440	glEnable GL_TEXTURE_2D;
2158	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2441	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2442	glColor 1, 1, 1, 1;
2159	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2443	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2160	glDisable GL_TEXTURE_2D;	2444	glDisable GL_TEXTURE_2D;
2161	}
2162		2445
2163	$self->{children}[1]->draw;	2446	$self->{children}[1]->draw;
2164		2447
2165	}	2448	}
2166		2449
…		…
2260	@_,	2543	@_,
2261	can_events => 0,	2544	can_events => 0,
2262	)	2545	)
2263	}	2546	}
2264		2547
2265	sub set_markup {	2548	sub set_tooltip_from {
2266	my ($self, $text) = @_;	2549	my ($self, $widget) = @_;
2267		2550
2268	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2551	$self->add (new CFClient::UI::Label
2269	$self->{label}->set_markup ($text);	2552	markup => $widget->{tooltip},
2270	$self->add ($self->{label});	2553	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2554	fontsize => 0.8,
		2555	fg => [0, 0, 0, 1],
		2556	ellipsise => 0,
		2557	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2558	);
2271	}	2559	}
2272		2560
2273	sub size_request {	2561	sub size_request {
2274	my ($self) = @_;	2562	my ($self) = @_;
2275
2276	$self->child->set_max_size ($::WIDTH * 0.3);
2277		2563
2278	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2564	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2279		2565
2280	($w + 4, $h + 4)	2566	($w + 4, $h + 4)
2281	}	2567	}
…		…
2287	}	2573	}
2288		2574
2289	sub _draw {	2575	sub _draw {
2290	my ($self) = @_;	2576	my ($self) = @_;
2291		2577
2292	glPushMatrix;
2293	glTranslate 0.375, 0.375;	2578	glTranslate 0.375, 0.375;
2294		2579
2295	my ($w, $h) = @$self{qw(w h)};	2580	my ($w, $h) = @$self{qw(w h)};
2296		2581
2297	glColor 1, 0.8, 0.4;	2582	glColor 1, 0.8, 0.4;
…		…
2308	glVertex 0 , $h;	2593	glVertex 0 , $h;
2309	glVertex $w, $h;	2594	glVertex $w, $h;
2310	glVertex $w, 0;	2595	glVertex $w, 0;
2311	glEnd;	2596	glEnd;
2312		2597
2313	glPopMatrix;	2598	glTranslate 2 - 0.375, 2 - 0.375;
2314
2315	glTranslate 2, 2;
2316	$self->SUPER::_draw;	2599	$self->SUPER::_draw;
2317	}	2600	}
2318		2601
2319	#############################################################################	2602	#############################################################################
2320		2603
…		…
2325	use CFClient::OpenGL;	2608	use CFClient::OpenGL;
2326		2609
2327	sub new {	2610	sub new {
2328	my $class = shift;	2611	my $class = shift;
2329		2612
2330	$class->SUPER::new (	2613	my $self = $class->SUPER::new (
2331	aspect => 1,	2614	aspect => 1,
2332	@_,	2615	@_,
2333	)	2616	);
		2617
		2618	if ($self->{anim} && $self->{animspeed}) {
		2619	Scalar::Util::weaken (my $widget = $self);
		2620
		2621	$self->{timer} = Event->timer (
		2622	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2623	hard => 1,
		2624	interval => $self->{animspeed},
		2625	cb => sub {
		2626	++$widget->{frame};
		2627	$widget->update;
		2628	},
		2629	);
		2630	}
		2631
		2632	$self
2334	}	2633	}
2335		2634
2336	sub size_request {	2635	sub size_request {
2337	(32, 8)	2636	(32, 8)
2338	}	2637	}
2339		2638
		2639	sub update {
		2640	my ($self) = @_;
		2641
		2642	return unless $self->{visible};
		2643
		2644	$self->SUPER::update;
		2645	}
		2646
2340	sub draw {	2647	sub _draw {
2341	my ($self) = @_;	2648	my ($self) = @_;
2342		2649
		2650	return unless $::CONN;
		2651
		2652	my $face;
		2653
		2654	if ($self->{frame}) {
		2655	my $anim = $::CONN->{anim}[$self->{anim}];
		2656
		2657	$face = $anim->[ $self->{frame} % @$anim ]
		2658	if $anim && @$anim;
		2659	}
		2660
2343	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2661	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2344		2662
2345	if ($tex) {	2663	if ($tex) {
2346	glEnable GL_BLEND;
2347	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2348	glEnable GL_TEXTURE_2D;	2664	glEnable GL_TEXTURE_2D;
2349	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2350	glColor 1, 1, 1, 1;	2666	glColor 1, 1, 1, 1;
2351	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2667	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2352	glDisable GL_TEXTURE_2D;	2668	glDisable GL_TEXTURE_2D;
2353	glDisable GL_BLEND;
2354	}	2669	}
		2670	}
		2671
		2672	sub DESTROY {
		2673	my ($self) = @_;
		2674
		2675	$self->{timer}->cancel
		2676	if $self->{timer};
		2677
		2678	$self->SUPER::DESTROY;
2355	}	2679	}
2356		2680
2357	#############################################################################	2681	#############################################################################
2358		2682
		2683	package CFClient::UI::InventoryItem;
		2684
		2685	our @ISA = CFClient::UI::HBox::;
		2686
		2687	sub _item_to_desc {
		2688	my ($item) = @_;
		2689
		2690	my $desc =
		2691	$item->{nrof} < 2
		2692	? $item->{name}
		2693	: "$item->{nrof} × $item->{name_pl}";
		2694
		2695	$item->{flags} & Crossfire::Protocol::F_OPEN
		2696	and $desc .= " (open)";
		2697	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2698	and $desc .= " (applied)";
		2699	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2700	and $desc .= " (unpaid)";
		2701	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2702	and $desc .= " (magic)";
		2703	$item->{flags} & Crossfire::Protocol::F_CURSED
		2704	and $desc .= " (cursed)";
		2705	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2706	and $desc .= " (damned)";
		2707	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2708	and $desc .= " *";
		2709
		2710	$desc
		2711	}
		2712
		2713	sub new {
		2714	my $class = shift;
		2715
		2716	my %args = @_;
		2717
		2718	my $item = delete $args{item};
		2719
		2720	my $desc = _item_to_desc ($item);
		2721
		2722	my $self = $class->SUPER::new (
		2723	can_hover => 1,
		2724	can_events => 1,
		2725	tooltip => ((CFClient::UI::Label::escape $desc)
		2726	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
		2727	connect_button_down => sub {
		2728	my ($self, $ev, $x, $y) = @_;
		2729
		2730	# todo: maybe put examine on 1? but should just be a tooltip :(
		2731	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2732	my $targ = $::CONN->{player}{tag};
		2733
		2734	if ($item->{container} == $::CONN->{player}{tag}) {
		2735	$targ = $main::OPENCONT;
		2736	}
		2737
		2738	$::CONN->send ("move $targ $item->{tag} 0");
		2739	} elsif ($ev->{button} == 1) {
		2740	$::CONN->send ("examine $item->{tag}");
		2741	} elsif ($ev->{button} == 2) {
		2742	$::CONN->send ("apply $item->{tag}");
		2743	} elsif ($ev->{button} == 3) {
		2744	my @menu_items = (
		2745	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2746	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
		2747	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2748	(
		2749	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2750	? (
		2751	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2752	)
		2753	: (
		2754	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
		2755	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2756	)
		2757	),
		2758	);
		2759
		2760	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2761	}
		2762
		2763	1
		2764	},
		2765	%args
		2766	);
		2767
		2768
		2769	$self->add (new CFClient::UI::Face
		2770	can_events => 0,
		2771	face => $item->{face},
		2772	anim => $item->{anim},
		2773	animspeed => $item->{animspeed},
		2774	);
		2775
		2776	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2777
		2778	$self->{item} = $item;
		2779
		2780	$self->update_item;
		2781
		2782	$self
		2783	}
		2784
		2785	sub update_item {
		2786	my ($self) = @_;
		2787
		2788	my $desc = _item_to_desc ($self->{item});
		2789
		2790	$self->{name_lbl}->set_text ($desc);
		2791	}
		2792
		2793	#############################################################################
		2794
		2795	package CFClient::UI::Inventory;
		2796
		2797	our @ISA = CFClient::UI::ScrolledWindow::;
		2798
		2799	sub new {
		2800	my $class = shift;
		2801
		2802	my $self = $class->SUPER::new (
		2803	scrolled => (new CFClient::UI::Table),
		2804	@_,
		2805	);
		2806
		2807	$self
		2808	}
		2809
		2810	sub set_items {
		2811	my ($self, $items) = @_;
		2812
		2813	$self->{scrolled}->clear;
		2814	return unless $items;
		2815
		2816	my @items = sort {
		2817	($a->{type} <=> $b->{type})
		2818	or ($a->{name} cmp $b->{name})
		2819	} @$items;
		2820
		2821	$self->{real_items} = \@items;
		2822
		2823	for my $item (@items) {
		2824	$item->{item} = $item;
		2825	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2826	$item->update_item ();
		2827	}
		2828
		2829	my $i = 0;
		2830	for (@items) {
		2831	$self->{scrolled}->add (0, $i, $_);
		2832	my $nrof = $_->{item}->{nrof} || 1;
		2833	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
		2834	}
		2835
		2836	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2837	}
		2838
		2839	sub size_request {
		2840	my ($self) = @_;
		2841	($self->{req_w}, $self->{req_h});
		2842	}
		2843
		2844	#############################################################################
		2845
		2846	package CFClient::UI::Menu;
		2847
		2848	our @ISA = CFClient::UI::FancyFrame::;
		2849
		2850	use CFClient::OpenGL;
		2851
		2852	sub new {
		2853	my $class = shift;
		2854
		2855	my $self = $class->SUPER::new (
		2856	items => [],
		2857	z => 100,
		2858	@_,
		2859	);
		2860
		2861	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2862
		2863	for my $item (@{ $self->{items} }) {
		2864	my ($widget, $cb) = @$item;
		2865
		2866	# handle various types of items, only text for now
		2867	if (!ref $widget) {
		2868	$widget = new CFClient::UI::Label
		2869	can_hover => 1,
		2870	can_events => 1,
		2871	text => $widget;
		2872	}
		2873
		2874	$self->{item}{$widget} = $item;
		2875
		2876	$self->{vbox}->add ($widget);
		2877	}
		2878
		2879	$self
		2880	}
		2881
		2882	# popup given the event (must be a mouse button down event currently)
		2883	sub popup {
		2884	my ($self, $ev) = @_;
		2885
		2886	$self->emit ("popdown");
		2887
		2888	# maybe save $GRAB? must be careful about events...
		2889	$GRAB = $self;
		2890	$self->{button} = $ev->{button};
		2891
		2892	$self->show;
		2893	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2894	}
		2895
		2896	sub mouse_motion {
		2897	my ($self, $ev, $x, $y) = @_;
		2898
		2899	# TODO: should use vbox->find_widget or so
		2900	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2901	$self->{hover} = $self->{item}{$HOVER};
		2902	}
		2903
		2904	sub button_up {
		2905	my ($self, $ev, $x, $y) = @_;
		2906
		2907	if ($ev->{button} == $self->{button}) {
		2908	undef $GRAB;
		2909	$self->hide;
		2910
		2911	$self->emit ("popdown");
		2912	$self->{hover}[1]->() if $self->{hover};
		2913	}
		2914	}
		2915
		2916	#############################################################################
		2917
		2918	package CFClient::UI::Statusbox;
		2919
		2920	our @ISA = CFClient::UI::VBox::;
		2921
		2922	sub new {
		2923	my $class = shift;
		2924
		2925	$class->SUPER::new (
		2926	fontsize => 0.8,
		2927	@_,
		2928	)
		2929	}
		2930
		2931	sub reorder {
		2932	my ($self) = @_;
		2933	my $NOW = time;
		2934
		2935	while (my ($k, $v) = each %{ $self->{item} }) {
		2936	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2937	}
		2938
		2939	my @widgets;
		2940
		2941	my @items = sort {
		2942	$a->{pri} <=> $b->{pri}
		2943	or $b->{id} <=> $a->{id}
		2944	} values %{ $self->{item} };
		2945
		2946	my $count = 10 + 1;
		2947	for my $item (@items) {
		2948	last unless --$count;
		2949
		2950	push @widgets, $item->{label} ||= do {
		2951	# TODO: doesn't handle markup well (read as: at all)
		2952	my $short = $item->{count} > 1
		2953	? "<b>$item->{count} ×</b> $item->{text}"
		2954	: $item->{text};
		2955
		2956	for ($short) {
		2957	s/^\s+//;
		2958	s/\s+/ /g;
		2959	}
		2960
		2961	new CFClient::UI::Label
		2962	markup => $short,
		2963	tooltip => $item->{tooltip},
		2964	tooltip_font => $::FONT_PROP,
		2965	tooltip_width => 0.67,
		2966	fontsize => $item->{fontsize} || $self->{fontsize},
		2967	max_w => $::WIDTH * 0.44,
		2968	fg => $item->{fg},
		2969	can_events => 1,
		2970	can_hover => 1
		2971	};
		2972	}
		2973
		2974	$self->clear;
		2975	$self->SUPER::add (reverse @widgets);
		2976	}
		2977
		2978	sub add {
		2979	my ($self, $text, %arg) = @_;
		2980
		2981	$text =~ s/^\s+//;
		2982	$text =~ s/\s+$//;
		2983
		2984	my $timeout = time + ((delete $arg{timeout}) || 60);
		2985
		2986	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2987
		2988	if (my $item = $self->{item}{$group}) {
		2989	if ($item->{text} eq $text) {
		2990	$item->{count}++;
		2991	} else {
		2992	$item->{count} = 1;
		2993	$item->{text} = $item->{tooltip} = $text;
		2994	}
		2995	$item->{id} = ++$self->{id};
		2996	$item->{timeout} = $timeout;
		2997	delete $item->{label};
		2998	} else {
		2999	$self->{item}{$group} = {
		3000	id => ++$self->{id},
		3001	text => $text,
		3002	timeout => $timeout,
		3003	tooltip => $text,
		3004	fg => [0.8, 0.8, 0.8, 0.8],
		3005	pri => 0,
		3006	count => 1,
		3007	%arg,
		3008	};
		3009	}
		3010
		3011	$self->reorder;
		3012	}
		3013
		3014	sub reconfigure {
		3015	my ($self) = @_;
		3016
		3017	delete $_->{label}
		3018	for values %{ $self->{item} || {} };
		3019
		3020	$self->reorder;
		3021	$self->SUPER::reconfigure;
		3022	}
		3023
		3024	#############################################################################
		3025
2359	package CFClient::UI::Root;	3026	package CFClient::UI::Root;
2360		3027
2361	our @ISA = CFClient::UI::Container::;	3028	our @ISA = CFClient::UI::Container::;
2362		3029
2363	use CFClient::OpenGL;	3030	use CFClient::OpenGL;
2364		3031
2365	sub check_size {	3032	sub new {
2366	my ($self) = @_;	3033	my $class = shift;
2367		3034
2368	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	3035	$class->SUPER::new (
2369	}	3036	@_,
2370		3037	)
2371	sub size_request {
2372	($::WIDTH, $::HEIGHT)
2373	}	3038	}
2374		3039
2375	sub configure {	3040	sub configure {
2376	my ($self, $x, $y, $w, $h) = @_;	3041	my ($self, $x, $y, $w, $h) = @_;
2377		3042
2378	$self->SUPER::configure ($x, $y, $w, $h);	3043	$self->{w} = $w;
		3044	$self->{h} = $h;
		3045	}
2379		3046
		3047	sub check_size {
		3048	my ($self) = @_;
		3049
		3050	$self->size_allocate ($self->{w}, $self->{h})
		3051	if $self->{w};
		3052	}
		3053
		3054	sub size_request {
		3055	my ($self) = @_;
		3056
		3057	($self->{w}, $self->{h})
		3058	}
		3059
		3060	sub size_allocate {
		3061	my ($self, $w, $h) = @_;
		3062
2380	for my $child (@{$self->{children}}) {	3063	for my $child ($self->children) {
2381	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3064	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2382		3065
		3066	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3067	if exists $child->{req_x};
		3068
		3069	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3070	if exists $child->{req_y};
		3071
2383	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3072	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2384	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3073	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3074
2385	$child->configure ($X, $Y, $W,$H);	3075	$child->configure ($X, $Y, $W, $H);
2386	}	3076	}
2387	}	3077	}
2388		3078
2389	sub _topleft {	3079	sub coord2local {
2390	my ($self, $x, $y) = @_;	3080	my ($self, $x, $y) = @_;
2391		3081
2392	($x, $y)	3082	($x, $y)
2393	}	3083	}
2394		3084
		3085	sub coord2global {
		3086	my ($self, $x, $y) = @_;
		3087
		3088	($x, $y)
		3089	}
		3090
2395	sub update {	3091	sub update {
2396	my ($self) = @_;	3092	my ($self) = @_;
2397		3093
2398	$self->check_size;	3094	$self->check_size;
2399	::refresh ();	3095	$::WANT_REFRESH++;
2400	}	3096	}
2401		3097
2402	sub add {	3098	sub add {
2403	my ($self, $child) = @_;	3099	my ($self, @children) = @_;
2404		3100
		3101	for (my @widgets = @children; my $w = pop @widgets; ) {
		3102	push @widgets, $w->children;
		3103	$w->{root} = $self;
		3104	$w->{visible} = 1;
		3105	}
		3106
		3107	for my $child (@children) {
		3108	$child->{is_toplevel} = 1;
		3109
2405	# integerize window positions	3110	# integerise window positions
2406	$child->{x} = int $child->{x};	3111	$child->{x} = int $child->{x};
2407	$child->{y} = int $child->{y};	3112	$child->{y} = int $child->{y};
		3113	}
2408		3114
2409	$self->SUPER::add ($child);	3115	$self->SUPER::add (@children);
		3116	}
		3117
		3118	sub remove {
		3119	my ($self, @children) = @_;
		3120
		3121	$self->SUPER::remove (@children);
		3122
		3123	while (@children) {
		3124	my $w = pop @children;
		3125	push @children, $w->children;
		3126	delete $w->{visible};
		3127	}
2410	}	3128	}
2411		3129
2412	sub on_refresh {	3130	sub on_refresh {
2413	my ($self, $id, $cb) = @_;	3131	my ($self, $id, $cb) = @_;
2414		3132
2415	$self->{refresh_hook}{$id} = $cb;	3133	$self->{refresh_hook}{$id} = $cb;
2416	}	3134	}
2417		3135
		3136	sub on_post_alloc {
		3137	my ($self, $id, $cb) = @_;
		3138
		3139	$self->{post_alloc_hook}{$id} = $cb;
		3140	}
		3141
2418	sub draw {	3142	sub draw {
2419	my ($self) = @_;	3143	my ($self) = @_;
2420		3144
2421	while (my $rcb = delete $self->{refresh_hook}) {	3145	while ($self->{refresh_hook}) {
2422	$_->() for values %$rcb;	3146	$_->()
		3147	for values %{delete $self->{refresh_hook}};
		3148	}
		3149
		3150	if ($self->{check_size}) {
		3151	my @queue = ([], []);
		3152
		3153	for (;;) {
		3154	if ($self->{check_size}) {
		3155	# heuristic: check containers last
		3156	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3157	for values %{delete $self->{check_size}}
		3158	}
		3159
		3160	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3161
		3162	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3163	? @$widget{qw(user_w user_h)}
		3164	: $widget->size_request;
		3165
		3166	if (delete $widget->{force_alloc}
		3167	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3168	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3169
		3170	$widget->{req_w} = $w;
		3171	$widget->{req_h} = $h;
		3172
		3173	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3174
		3175	$widget->{parent}->check_size
		3176	if $widget->{parent};
		3177	}
		3178	}
		3179	}
		3180
		3181	while ($self->{size_alloc}) {
		3182	for (values %{delete $self->{size_alloc}}) {
		3183	my ($widget, $w, $h) = @$_;
		3184
		3185	$w = 0 if $w < 0;
		3186	$h = 0 if $h < 0;
		3187
		3188	$widget->{w} = $w;
		3189	$widget->{h} = $h;
		3190	$widget->size_allocate ($w, $h);
		3191	$widget->emit (size_allocate => $w, $h);
		3192	}
		3193	}
		3194
		3195	while ($self->{post_alloc_hook}) {
		3196	$_->()
		3197	for values %{delete $self->{post_alloc_hook}};
2423	}	3198	}
2424		3199
2425	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3200	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2426	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3201	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2427	glClear GL_COLOR_BUFFER_BIT;	3202	glClear GL_COLOR_BUFFER_BIT;
2428		3203
2429	glMatrixMode GL_PROJECTION;	3204	glMatrixMode GL_PROJECTION;
2430	glLoadIdentity;	3205	glLoadIdentity;
2431	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3206	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2432	glMatrixMode GL_MODELVIEW;	3207	glMatrixMode GL_MODELVIEW;
2433	glLoadIdentity;	3208	glLoadIdentity;
2434		3209
2435	$self->_draw;	3210	$self->_draw;
2436	}	3211	}
…		…
2438	#############################################################################	3213	#############################################################################
2439		3214
2440	package CFClient::UI;	3215	package CFClient::UI;
2441		3216
2442	$ROOT = new CFClient::UI::Root;	3217	$ROOT = new CFClient::UI::Root;
2443	$TOOLTIP = new CFClient::UI::Tooltip;	3218	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2444		3219
2445	1	3220	1
2446		3221

Diff Legend

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