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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.240 by root, Fri May 26 18:28:23 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
13	our $ROOT;	14	our $ROOT;
14	our $TOOLTIP;	15	our $TOOLTIP;
…		…
50	delete $TOOLTIP->{owner};	51	delete $TOOLTIP->{owner};
51	}	52	}
52		53
53	# class methods for events	54	# class methods for events
54	sub feed_sdl_key_down_event {	55	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	56	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	57	if $FOCUS;
57	}	58	}
58		59
59	sub feed_sdl_key_up_event {	60	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	61	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	62	if $FOCUS;
62	}	63	}
63		64
64	sub feed_sdl_button_down_event {	65	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	66	my ($ev) = @_;
…		…
74	check_tooltip;	75	check_tooltip;
75	}	76	}
76		77
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		79
79	if ($GRAB) {	80	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	81	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	82	}
84		83
85	sub feed_sdl_button_up_event {	84	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	85	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	86	my ($x, $y) = ($ev->{x}, $ev->{y});
88		87
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		89
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		91
93	if ($GRAB) {	92	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	93	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		94
98	if (!$BUTTON_STATE) {	95	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	96	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	97	$grab->update if $grab;
101	$GRAB->update if $GRAB;	98	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	114	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		115
119	check_tooltip;	116	check_tooltip;
120	}	117	}
121		118
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	119	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	120	if $HOVER;
126	}	121	}
127		122
128	# convert position array to integers	123	# convert position array to integers
129	sub harmonize {	124	sub harmonize {
130	my ($vals) = @_;	125	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	131	$rem += $_ - $i;
137	$_ = $i;	132	$_ = $i;
138	}	133	}
139	}	134	}
140		135
		136	sub full_refresh {
		137	# make a copy, otherwise for complains about freed values.
		138	my @widgets = values %WIDGET;
		139
		140	$_->update
		141	for @widgets;
		142	}
		143
		144	sub reconfigure_widgets {
		145	# make a copy, otherwise C<for> complains about freed values.
		146	my @widgets = values %WIDGET;
		147
		148	$_->reconfigure
		149	for @widgets;
		150	}
		151
141	# call when resolution changes etc.	152	# call when resolution changes etc.
142	sub rescale_widgets {	153	sub rescale_widgets {
143	my ($sx, $sy) = @_;	154	my ($sx, $sy) = @_;
144		155
145	for my $widget (values %WIDGET) {	156	for my $widget (values %WIDGET) {
146	if ($widget->{toplevel}) {	157	if ($widget->{is_toplevel}) {
147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};	161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155	}	166	}
156
157	$widget->reconfigure;
158	}	167	}
		168
		169	reconfigure_widgets;
159	}	170	}
160		171
161	#############################################################################	172	#############################################################################
162		173
163	package CFClient::UI::Base;	174	package CFClient::UI::Base;
…		…
195	%$self = ();	206	%$self = ();
196	}	207	}
197		208
198	sub show {	209	sub show {
199	my ($self) = @_;	210	my ($self) = @_;
200
201	return if $self->{parent};	211	return if $self->{parent};
202		212
203	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
204	}	214	}
205		215
206	sub hide {	216	sub show_centered {
207	my ($self) = @_;	217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
		227	}
		228
		229	sub set_invisible {
		230	my ($self) = @_;
		231
		232	# broken show/hide model
		233
		234	delete $self->{visible};
208		235
209	undef $GRAB if $GRAB == $self;	236	undef $GRAB if $GRAB == $self;
210	undef $HOVER if $HOVER == $self;	237	undef $HOVER if $HOVER == $self;
		238
		239	CFClient::UI::check_tooltip
		240	if $CFClient::UI::TOOLTIP->{owner} == $self;
		241
		242	$self->focus_out;
		243	}
		244
		245	sub hide {
		246	my ($self) = @_;
		247
		248	$self->set_invisible;
211		249
212	$self->{parent}->remove ($self)	250	$self->{parent}->remove ($self)
213	if $self->{parent};	251	if $self->{parent};
214	}	252	}
215		253
…		…
282		320
283	delete $self->{max_w}; $self->{max_w} = $w if $w;	321	delete $self->{max_w}; $self->{max_w} = $w if $w;
284	delete $self->{max_h}; $self->{max_h} = $h if $h;	322	delete $self->{max_h}; $self->{max_h} = $h if $h;
285	}	323	}
286		324
		325	sub set_tooltip {
		326	my ($self, $tooltip) = @_;
		327
		328	$tooltip =~ s/^\s+//;
		329	$tooltip =~ s/\s+$//;
		330
		331	return if $self->{tooltip} eq $tooltip;
		332
		333	$self->{tooltip} = $tooltip;
		334
		335	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		336	delete $CFClient::UI::TOOLTIP->{owner};
		337	CFClient::UI::check_tooltip;
		338	}
		339	}
		340
287	# translate global coordinates to local coordinate system	341	# translate global coordinates to local coordinate system
288	sub coord2local {	342	sub coord2local {
289	my ($self, $x, $y) = @_;	343	my ($self, $x, $y) = @_;
290		344
291	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	345	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
304	return if $FOCUS == $self;	358	return if $FOCUS == $self;
305	return unless $self->{can_focus};	359	return unless $self->{can_focus};
306		360
307	my $focus = $FOCUS; $FOCUS = $self;	361	my $focus = $FOCUS; $FOCUS = $self;
308		362
309	$self->emit (focus_in => $focus);	363	$self->_emit (focus_in => $focus);
310		364
311	$focus->update if $focus;	365	$focus->update if $focus;
312	$FOCUS->update;	366	$FOCUS->update;
313	}	367	}
314		368
…		…
317		371
318	return unless $FOCUS == $self;	372	return unless $FOCUS == $self;
319		373
320	my $focus = $FOCUS; undef $FOCUS;	374	my $focus = $FOCUS; undef $FOCUS;
321		375
322	$self->emit (focus_out => $focus);	376	$self->_emit (focus_out => $focus);
323		377
324	$focus->update if $focus; #?	378	$focus->update if $focus; #?
		379
		380	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		381	unless $FOCUS;
325	}	382	}
326		383
327	sub mouse_motion { }	384	sub mouse_motion { }
328	sub button_up { }	385	sub button_up { }
329	sub key_down { }	386	sub key_down { }
330	sub key_up { }	387	sub key_up { }
331		388
332	sub button_down {	389	sub button_down {
333	my ($self, $ev, $x, $y) = @_;	390	my ($self, $ev, $x, $y) = @_;
334		391
335	$self->focus_in;	392	$self->focus_in;
…		…
369	if ($ENV{PCLIENT_DEBUG}) {	426	if ($ENV{PCLIENT_DEBUG}) {
370	glPushMatrix;	427	glPushMatrix;
371	glColor 1, 1, 0, 1;	428	glColor 1, 1, 0, 1;
372	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	429	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373	glBegin GL_LINE_LOOP;	430	glBegin GL_LINE_LOOP;
374	glVertex 0 , 0;	431	glVertex 0 , 0;
375	glVertex $self->{w}, 0;	432	glVertex $self->{w} - 1, 0;
376	glVertex $self->{w}, $self->{h};	433	glVertex $self->{w} - 1, $self->{h} - 1;
377	glVertex 0 , $self->{h};	434	glVertex 0 , $self->{h} - 1;
378	glEnd;	435	glEnd;
379	glPopMatrix;	436	glPopMatrix;
380	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	437	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381	}	438	}
382	}	439	}
…		…
402	sub set_parent {	459	sub set_parent {
403	my ($self, $parent) = @_;	460	my ($self, $parent) = @_;
404		461
405	Scalar::Util::weaken ($self->{parent} = $parent);	462	Scalar::Util::weaken ($self->{parent} = $parent);
406		463
		464	$self->{root} = $parent->{root};
		465	$self->{visible} = $parent->{visible};
		466
407	# TODO: req_w _does_change after ->reconfigure	467	# TODO: req_w _does_change after ->reconfigure
408	$self->check_size	468	$self->check_size
409	unless exists $self->{req_w};	469	unless exists $self->{req_w};
		470
		471	$self->show;
410	}	472	}
411		473
412	sub check_size {	474	sub check_size {
413	my ($self, $forced) = @_;	475	my ($self, $forced) = @_;
414		476
…		…
427	my ($self, $signal, $cb) = @_;	489	my ($self, $signal, $cb) = @_;
428		490
429	push @{ $self->{signal_cb}{$signal} }, $cb;	491	push @{ $self->{signal_cb}{$signal} }, $cb;
430	}	492	}
431		493
		494	sub _emit {
		495	my ($self, $signal, @args) = @_;
		496
		497	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		498	}
		499
432	sub emit {	500	sub emit {
433	my ($self, $signal, @args) = @_;	501	my ($self, $signal, @args) = @_;
434		502
435	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	503	$self->_emit ($signal, @args)
		504	|| $self->$signal (@args);
436	}	505	}
437		506
438	sub DESTROY {	507	sub DESTROY {
439	my ($self) = @_;	508	my ($self) = @_;
440		509
…		…
455	my $class = shift;	524	my $class = shift;
456		525
457	# range [value, low, high, page]	526	# range [value, low, high, page]
458		527
459	$class->SUPER::new (	528	$class->SUPER::new (
460	bg => [0, 0, 0, 0.2],	529	#bg => [0, 0, 0, 0.2],
461	active_bg => [1, 1, 1, 0.5],	530	#active_bg => [1, 1, 1, 0.5],
462	@_	531	@_
463	)	532	)
464	}	533	}
465		534
466	sub _draw {	535	sub _draw {
467	my ($self) = @_;	536	my ($self) = @_;
468		537
		538	my $color = $FOCUS == $self && $self->{active_bg}
		539	? $self->{active_bg}
		540	: $self->{bg};
		541
		542	if ($color && (@$color < 4 || $color->[3])) {
469	my ($w, $h) = @$self{qw(w h)};	543	my ($w, $h) = @$self{qw(w h)};
470		544
471	glEnable GL_BLEND;	545	glEnable GL_BLEND;
472	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	547	glColor @$color;
474		548
475	glBegin GL_QUADS;	549	glBegin GL_QUADS;
476	glVertex 0 , 0;	550	glVertex 0 , 0;
477	glVertex 0 , $h;	551	glVertex 0 , $h;
478	glVertex $w, $h;	552	glVertex $w, $h;
479	glVertex $w, 0;	553	glVertex $w, 0;
480	glEnd;	554	glEnd;
481		555
482	glDisable GL_BLEND;	556	glDisable GL_BLEND;
		557	}
483	}	558	}
484		559
485	#############################################################################	560	#############################################################################
486		561
487	package CFClient::UI::Empty;	562	package CFClient::UI::Empty;
…		…
547	delete $child->{parent};	622	delete $child->{parent};
548	$child->hide;	623	$child->hide;
549		624
550	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	625	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551		626
552	$self->check_size;	627	$self->check_size (1);
553	$self->update;	628	$self->update;
554	}	629	}
555		630
556	sub clear {	631	sub clear {
557	my ($self) = @_;	632	my ($self) = @_;
…		…
671	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	746	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672	glClearColor 0, 0, 0, 0;	747	glClearColor 0, 0, 0, 0;
673	glClear GL_COLOR_BUFFER_BIT;	748	glClear GL_COLOR_BUFFER_BIT;
674		749
675	$self->_render;	750	$self->_render;
676	# glColorMask 1, 1, 1, 0;
677	# glEnable GL_BLEND;
678	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679	# glRasterPos 0, 0;
680	# glCopyPixels 0, 0, $self->{w}, $self->{h};
681	# glDisable GL_BLEND;
682	# glColorMask 1, 1, 1, 1;
683	};	751	};
684	}	752	}
685		753
686	sub _draw {	754	sub _draw {
687	my ($self) = @_;	755	my ($self) = @_;
…		…
691	my $tex = $self->{texture}	759	my $tex = $self->{texture}
692	or return;	760	or return;
693		761
694	glEnable GL_TEXTURE_2D;	762	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	763	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	764	glColor 1, 1, 1, 1;
697		765
698	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	766	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		767
700	glDisable GL_TEXTURE_2D;	768	glDisable GL_TEXTURE_2D;
701	}	769	}
…		…
704		772
705	package CFClient::UI::ViewPort;	773	package CFClient::UI::ViewPort;
706		774
707	our @ISA = CFClient::UI::Window::;	775	our @ISA = CFClient::UI::Window::;
708		776
		777	sub new {
		778	my $class = shift;
		779
		780	$class->SUPER::new (
		781	scroll_x => 0,
		782	scroll_y => 1,
		783	@_,
		784	)
		785	}
		786
709	sub size_request {	787	sub size_request {
710	my ($self) = @_;	788	my ($self) = @_;
711		789
712	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	790	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
714		791
715	@$self{qw(child_w child_h)}	792	@$self{qw(child_w child_h)}
716	}	793	}
717		794
718	sub size_allocate {	795	sub size_allocate {
719	my ($self, $w, $h) = @_;	796	my ($self, $w, $h) = @_;
720		797
		798	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		799	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		800
		801	$self->child->configure (0, 0, $w, $h);
721	$self->update;	802	$self->update;
722	}	803	}
723		804
724	sub set_offset {	805	sub set_offset {
725	my ($self, $x, $y) = @_;	806	my ($self, $x, $y) = @_;
…		…
779		860
780	my $slider = new CFClient::UI::Slider	861	my $slider = new CFClient::UI::Slider
781	vertical => 1,	862	vertical => 1,
782	range => [0, 0, 1, 0.01], # HACK fix	863	range => [0, 0, 1, 0.01], # HACK fix
783	connect_changed => sub {	864	connect_changed => sub {
784	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	865	$self->{vp}->set_offset (0, $_[1]);
785	},	866	},
786	;	867	;
787		868
788	$self = $class->SUPER::new (	869	$self = $class->SUPER::new (
789	vp => (new CFClient::UI::ViewPort),	870	vp => (new CFClient::UI::ViewPort expand => 1),
790	slider => $slider,	871	slider => $slider,
791	@_,	872	@_,
792	);	873	);
793		874
794	$self->{vp}->add ($self->{scrolled});	875	$self->{vp}->add ($self->{scrolled});
795	$self->add ($self->{vp});	876	$self->add ($self->{vp});
796	$self->add ($self->{slider});	877	$self->add ($self->{slider});
797		878
798	$self	879	$self
		880	}
		881
		882	sub update {
		883	my ($self) = @_;
		884
		885	$self->SUPER::update;
		886
		887	# todo: overwrite size_allocate of child
		888	my $child = $self->{vp}->child;
		889	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		890	}
		891
		892	sub size_allocate {
		893	my ($self, $w, $h) = @_;
		894
		895	$self->SUPER::size_allocate ($w, $h);
		896
		897	my $child = $self->{vp}->child;
		898	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799	}	899	}
800		900
801	#TODO# update range on size_allocate depending on child	901	#TODO# update range on size_allocate depending on child
802	# update viewport offset on scroll	902	# update viewport offset on scroll
803		903
…		…
857	my $class = shift;	957	my $class = shift;
858		958
859	# TODO: user_x, user_y, overwrite moveto?	959	# TODO: user_x, user_y, overwrite moveto?
860		960
861	my $self = $class->SUPER::new (	961	my $self = $class->SUPER::new (
862	bg => [1, 1, 1, 1],	962	bg => [1, 1, 1, 1],
863	border_bg => [1, 1, 1, 1],	963	border_bg => [1, 1, 1, 1],
864	border => 0.6,	964	border => 0.6,
865	toplevel => 1,	965	is_toplevel => 1,
866	can_events => 1,	966	can_events => 1,
867	@_	967	@_
868	);	968	);
869		969
870	$self->{title} &&= new CFClient::UI::Label	970	$self->{title} &&= new CFClient::UI::Label
871	align => 0,	971	align => 0,
…		…
1011	sub new {	1111	sub new {
1012	my $class = shift;	1112	my $class = shift;
1013		1113
1014	$class->SUPER::new (	1114	$class->SUPER::new (
1015	col_expand => [],	1115	col_expand => [],
1016	@_	1116	@_,
1017	)	1117	)
		1118	}
		1119
		1120	sub children {
		1121	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018	}	1122	}
1019		1123
1020	sub add {	1124	sub add {
1021	my ($self, $x, $y, $child) = @_;	1125	my ($self, $x, $y, $child) = @_;
1022		1126
1023	$child->set_parent ($self);	1127	$child->set_parent ($self);
1024	$self->{children}[$y][$x] = $child;	1128	$self->{children}[$y][$x] = $child;
1025		1129
1026	$child->check_size;	1130	$self->check_size (1);
1027	}	1131	}
1028		1132
1029	sub children {
1030	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031	}
1032
1033	# TODO: move to container class maybe? send childs a signal on removal?	1133	# TODO: move to container class maybe? send children a signal on removal?
1034	sub clear {	1134	sub clear {
1035	my ($self) = @_;	1135	my ($self) = @_;
1036		1136
1037	my @children = $self->children;	1137	my @children = $self->children;
1038	delete $self->{children};	1138	delete $self->{children};
…		…
1040	for (@children) {	1140	for (@children) {
1041	delete $_->{parent};	1141	delete $_->{parent};
1042	$_->hide;	1142	$_->hide;
1043	}	1143	}
1044		1144
		1145	$self->check_size (1);
1045	$self->update;	1146	$self->update;
1046	}	1147	}
1047		1148
1048	sub get_wh {	1149	sub get_wh {
1049	my ($self) = @_;	1150	my ($self) = @_;
…		…
1081	sub size_allocate {	1182	sub size_allocate {
1082	my ($self, $w, $h) = @_;	1183	my ($self, $w, $h) = @_;
1083		1184
1084	my ($ws, $hs) = $self->get_wh;	1185	my ($ws, $hs) = $self->get_wh;
1085		1186
1086	my $req_w = sum @$ws;	1187	my $req_w = (sum @$ws) || 1;
1087	my $req_h = sum @$hs;	1188	my $req_h = (sum @$hs) || 1;
1088		1189
1089	# TODO: nicer code && do row_expand	1190	# TODO: nicer code && do row_expand
1090	my @col_expand = @{$self->{col_expand}};	1191	my @col_expand = @{$self->{col_expand}};
1091	@col_expand = (1) x @$ws unless @col_expand;	1192	@col_expand = (1) x @$ws unless @col_expand;
1092	my $col_expand = (sum @col_expand) || 1;	1193	my $col_expand = (sum @col_expand) || 1;
…		…
1266		1367
1267	#############################################################################	1368	#############################################################################
1268		1369
1269	package CFClient::UI::Label;	1370	package CFClient::UI::Label;
1270		1371
1271	our @ISA = CFClient::UI::Base::;	1372	our @ISA = CFClient::UI::DrawBG::;
1272		1373
1273	use CFClient::OpenGL;	1374	use CFClient::OpenGL;
1274		1375
1275	sub new {	1376	sub new {
1276	my ($class, %arg) = @_;	1377	my ($class, %arg) = @_;
1277		1378
1278	my $self = $class->SUPER::new (	1379	my $self = $class->SUPER::new (
1279	fg => [1, 1, 1],	1380	fg => [1, 1, 1],
		1381	#bg => none
		1382	#active_bg => none
1280	#font => default_font	1383	#font => default_font
1281	#text => initial text	1384	#text => initial text
1282	#markup => initial narkup	1385	#markup => initial narkup
		1386	#max_w => maximum pixel width
		1387	ellipsise => 3, # end
1283	layout => (new CFClient::Layout),	1388	layout => (new CFClient::Layout),
1284	fontsize => 1,	1389	fontsize => 1,
1285	align => -1,	1390	align => -1,
1286	valign => -1,	1391	valign => -1,
1287	padding => 2,	1392	padding => 2,
…		…
1302	}	1407	}
1303		1408
1304	$self	1409	$self
1305	}	1410	}
1306		1411
1307	sub escape {	1412	sub escape($) {
1308	local $_ = $_[1];	1413	local $_ = $_[0];
1309		1414
1310	s/&/&amp;/g;	1415	s/&/&amp;/g;
1311	s/>/&gt;/g;	1416	s/>/&gt;/g;
1312	s/</&lt;/g;	1417	s/</&lt;/g;
1313		1418
1314	$_[1]	1419	$_
1315	}	1420	}
1316		1421
1317	sub update {	1422	sub update {
1318	my ($self) = @_;	1423	my ($self) = @_;
1319		1424
…		…
1352	sub size_request {	1457	sub size_request {
1353	my ($self) = @_;	1458	my ($self) = @_;
1354		1459
1355	$self->{layout}->set_font ($self->{font}) if $self->{font};	1460	$self->{layout}->set_font ($self->{font}) if $self->{font};
1356	$self->{layout}->set_width ($self->{max_w} || -1);	1461	$self->{layout}->set_width ($self->{max_w} || -1);
		1462	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1463	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1464	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358		1465
1359	my ($w, $h) = $self->{layout}->size;	1466	my ($w, $h) = $self->{layout}->size;
1360		1467
1361	if (exists $self->{template}) {	1468	if (exists $self->{template}) {
…		…
1391	}	1498	}
1392		1499
1393	sub _draw {	1500	sub _draw {
1394	my ($self) = @_;	1501	my ($self) = @_;
1395		1502
		1503	$self->SUPER::_draw; # draw background, if applicable
		1504
1396	my $tex = $self->{texture} ||= do {	1505	my $tex = $self->{texture} ||= do {
1397	$self->{layout}->set_foreground (@{$self->{fg}});	1506	$self->{layout}->set_foreground (@{$self->{fg}});
1398	$self->{layout}->set_font ($self->{font}) if $self->{font};	1507	$self->{layout}->set_font ($self->{font}) if $self->{font};
1399	$self->{layout}->set_width ($self->{w});	1508	$self->{layout}->set_width ($self->{w});
		1509	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1510	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1511	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401		1512
1402	my $tex = new_from_layout CFClient::Texture $self->{layout};	1513	my $tex = new_from_layout CFClient::Texture $self->{layout};
1403		1514
1404	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1515	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1516	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
…		…
1443	active_fg => [0, 0, 0],	1554	active_fg => [0, 0, 0],
1444	can_hover => 1,	1555	can_hover => 1,
1445	can_focus => 1,	1556	can_focus => 1,
1446	valign => 0,	1557	valign => 0,
1447	can_events => 1,	1558	can_events => 1,
		1559	#text => ...
1448	@_	1560	@_
1449	)	1561	)
1450	}	1562	}
1451		1563
1452	sub _set_text {	1564	sub _set_text {
…		…
1462	$self->{text} = $text;	1574	$self->{text} = $text;
1463		1575
1464	$text =~ s/./*/g if $self->{hidden};	1576	$text =~ s/./*/g if $self->{hidden};
1465	$self->{layout}->set_text ("$text ");	1577	$self->{layout}->set_text ("$text ");
1466		1578
1467	$self->emit (changed => $self->{text});	1579	$self->_emit (changed => $self->{text});
1468	}	1580	}
1469		1581
1470	sub set_text {	1582	sub set_text {
1471	my ($self, $text) = @_;	1583	my ($self, $text) = @_;
1472		1584
…		…
1484	my ($self) = @_;	1596	my ($self) = @_;
1485		1597
1486	my ($w, $h) = $self->SUPER::size_request;	1598	my ($w, $h) = $self->SUPER::size_request;
1487		1599
1488	($w + 1, $h) # add 1 for cursor	1600	($w + 1, $h) # add 1 for cursor
1489	}
1490
1491	sub size_allocate {
1492	my ($self, $w, $h) = @_;
1493
1494	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495	}	1601	}
1496		1602
1497	sub key_down {	1603	sub key_down {
1498	my ($self, $ev) = @_;	1604	my ($self, $ev) = @_;
1499		1605
…		…
1514	} elsif ($sym == CFClient::SDLK_HOME) {	1620	} elsif ($sym == CFClient::SDLK_HOME) {
1515	$self->{cursor} = 0;	1621	$self->{cursor} = 0;
1516	} elsif ($sym == CFClient::SDLK_END) {	1622	} elsif ($sym == CFClient::SDLK_END) {
1517	$self->{cursor} = length $text;	1623	$self->{cursor} = length $text;
1518	} elsif ($uni == 27) {	1624	} elsif ($uni == 27) {
1519	$self->emit ('escape');	1625	$self->_emit ('escape');
1520	} elsif ($uni) {	1626	} elsif ($uni) {
1521	substr $text, $self->{cursor}++, 0, chr $uni;	1627	substr $text, $self->{cursor}++, 0, chr $uni;
1522	}	1628	}
1523		1629
1524	$self->_set_text ($text);	1630	$self->_set_text ($text);
…		…
1611	if ($sym == 13) {	1717	if ($sym == 13) {
1612	unshift @{$self->{history}},	1718	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	1719	my $txt = $self->get_text;
1614	$self->{history_pointer} = -1;	1720	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	1721	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	1722	$self->_emit (activate => $txt);
1617	$self->update;	1723	$self->update;
1618		1724
1619	} elsif ($sym == CFClient::SDLK_UP) {	1725	} elsif ($sym == CFClient::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	1726	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	1727	$self->{history_saveback} = $self->get_text;
…		…
1660	my $class = shift;	1766	my $class = shift;
1661		1767
1662	$class->SUPER::new (	1768	$class->SUPER::new (
1663	padding => 4,	1769	padding => 4,
1664	fg => [1, 1, 1],	1770	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1771	active_fg => [0, 0, 1],
1667	can_hover => 1,	1772	can_hover => 1,
1668	align => 0,	1773	align => 0,
1669	valign => 0,	1774	valign => 0,
1670	can_events => 1,	1775	can_events => 1,
1671	@_	1776	@_
1672	)	1777	)
1673	}	1778	}
1674		1779
		1780	sub activate { }
		1781
1675	sub button_up {	1782	sub button_up {
1676	my ($self, $ev, $x, $y) = @_;	1783	my ($self, $ev, $x, $y) = @_;
1677		1784
		1785	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	1786	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	1787	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");
1681	}
1682	}	1788	}
1683		1789
1684	sub _draw {	1790	sub _draw {
1685	my ($self) = @_;	1791	my ($self) = @_;
1686		1792
…		…
1718		1824
1719	$class->SUPER::new (	1825	$class->SUPER::new (
1720	padding => 2,	1826	padding => 2,
1721	fg => [1, 1, 1],	1827	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1828	active_fg => [1, 1, 0],
		1829	bg => [0, 0, 0, 0.2],
		1830	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1831	state => 0,
1724	can_hover => 1,	1832	can_hover => 1,
1725	@_	1833	@_
1726	)	1834	)
1727	}	1835	}
…		…
1736	my ($self, $ev, $x, $y) = @_;	1844	my ($self, $ev, $x, $y) = @_;
1737		1845
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1846	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1847	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740	$self->{state} = !$self->{state};	1848	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});	1849	$self->_emit (changed => $self->{state});
1742	}	1850	}
1743	}	1851	}
1744		1852
1745	sub _draw {	1853	sub _draw {
1746	my ($self) = @_;	1854	my ($self) = @_;
…		…
2019	# TODO: req_w/h are wrong with vertical	2127	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2128	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2129	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2130	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2131	active_fg => [0, 0, 0],
		2132	bg => [0, 0, 0, 0.2],
		2133	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2134	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2135	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2136	req_h => $::WIDTH / 80,
2027	vertical => 0,	2137	vertical => 0,
2028	can_hover => 1,	2138	can_hover => 1,
2029	inner_pad => .05,	2139	inner_pad => 0.02,
2030	@_	2140	@_
2031	);	2141	);
2032		2142
2033	$self->set_value ($self->{range}[0]);	2143	$self->set_value ($self->{range}[0]);
2034	$self->update;	2144	$self->update;
2035		2145
2036	$self	2146	$self
2037	}	2147	}
2038		2148
		2149	sub set_range {
		2150	my ($self, $range) = @_;
		2151
		2152	($range, $self->{range}) = ($self->{range}, $range);
		2153
		2154	$self->update
		2155	if "@$range" ne "@{$self->{range}}";
		2156	}
		2157
2039	sub set_value {	2158	sub set_value {
2040	my ($self, $value) = @_;	2159	my ($self, $value) = @_;
2041		2160
2042	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2161	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043		2162
2044	$hi = $lo + 1 if $hi <= $lo;	2163	$hi = $lo + 1 if $hi <= $lo;
2045		2164
		2165	$page = $hi - $lo if $page > $hi - $lo;
		2166
2046	$value = $lo if $value < $lo;	2167	$value = $lo if $value < $lo;
2047	$value = $hi if $value > $hi;	2168	$value = $hi - $page if $value > $hi - $page;
2048		2169
2049	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2170	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050	if $unit;	2171	if $unit;
2051		2172
2052	$page = $hi - $lo if $page > $hi - $lo;
2053
2054	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2173	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055		2174
2056	if ($value != $old_value) {	2175	if ($value != $old_value) {
2057	$self->emit (changed => $value);	2176	$self->_emit (changed => $value);
2058	$self->update;	2177	$self->update;
2059	}	2178	}
2060	}	2179	}
2061		2180
2062	sub size_request {	2181	sub size_request {
…		…
2070		2189
2071	sub button_down {	2190	sub button_down {
2072	my ($self, $ev, $x, $y) = @_;	2191	my ($self, $ev, $x, $y) = @_;
2073		2192
2074	$self->SUPER::button_down ($ev, $x, $y);	2193	$self->SUPER::button_down ($ev, $x, $y);
		2194
		2195	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2196
2075	$self->mouse_motion ($ev, $x, $y);	2197	$self->mouse_motion ($ev, $x, $y);
2076	}	2198	}
2077		2199
2078	sub mouse_motion {	2200	sub mouse_motion {
2079	my ($self, $ev, $x, $y) = @_;	2201	my ($self, $ev, $x, $y) = @_;
…		…
2081	if ($GRAB == $self) {	2203	if ($GRAB == $self) {
2082	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2204	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083		2205
2084	my (undef, $lo, $hi, $page) = @{$self->{range}};	2206	my (undef, $lo, $hi, $page) = @{$self->{range}};
2085		2207
2086	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2208	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2087		2209
2088	$self->set_value ($x * ($hi - $lo) + $lo);	2210	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2089	}	2211	}
2090	}	2212	}
2091		2213
2092	sub update {	2214	sub update {
2093	my ($self) = @_;	2215	my ($self) = @_;
2094		2216
2095	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2217	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096	$self->set_value ($self->{range}[0]);	2218	$self->set_value ($self->{range}[0]);
2097		2219
2098	my ($value, $lo, $hi, $page) = @{$self->{range}};	2220	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2221	my $range = ($hi - $page - $lo) || 1e-100;
2099		2222
2100	my $inner_w = 1 - 2 * $self->{inner_pad};	2223	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2101		2224
2102	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2225	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2226	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2103		2227
2104	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2228	$value = ($value - $lo) / $range;
2105	$value = $self->{scale} * ($value - $lo);	2229	$value = $value * $self->{scale} + $self->{offset};
2106		2230
2107	$value = $self->{inner_pad} + ($value - $page * 0.5);
2108
2109	$value = 0 if $value < 0;
2110	$page = 1 - $value if $value + $page > 1;
2111
2112	$self->{knob_x} = $value;	2231	$self->{knob_x} = $value - $knob_w * 0.5;
2113	$self->{knob_w} = $page;	2232	$self->{knob_w} = $knob_w;
2114	});	2233	});
2115		2234
2116	$self->SUPER::update;	2235	$self->SUPER::update;
2117	}	2236	}
2118		2237
…		…
2124	glScale $self->{w}, $self->{h};	2243	glScale $self->{w}, $self->{h};
2125		2244
2126	if ($self->{vertical}) {	2245	if ($self->{vertical}) {
2127	# draw a vertical slider like a rotated horizontal slider	2246	# draw a vertical slider like a rotated horizontal slider
2128		2247
		2248	glTranslate 1, 0, 0;
2129	glRotate 90, 0, 0, 1;	2249	glRotate 90, 0, 0, 1;
2130	glTranslate 0, 1, 0;
2131	}	2250	}
2132		2251
2133	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2252	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2134	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2253	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2135		2254
…		…
2142	# draw handle	2261	# draw handle
2143	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2262	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144		2263
2145	glDisable GL_TEXTURE_2D;	2264	glDisable GL_TEXTURE_2D;
2146	}	2265	}
		2266
		2267	#############################################################################
		2268
		2269	package CFClient::UI::ValSlider;
		2270
		2271	our @ISA = CFClient::UI::HBox::;
		2272
		2273	sub new {
		2274	my ($class, %arg) = @_;
		2275
		2276	my $range = delete $arg{range};
		2277
		2278	my $self = $class->SUPER::new (
		2279	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2280	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2281	to_value => sub { shift },
		2282	from_value => sub { shift },
		2283	%arg,
		2284	);
		2285
		2286	$self->{slider}->connect (changed => sub {
		2287	my ($self, $value) = @_;
		2288	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2289	$self->{parent}->emit (changed => $value);
		2290	});
		2291
		2292	# $self->{entry}->connect (changed => sub {
		2293	# my ($self, $value) = @_;
		2294	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2295	# $self->{parent}->emit (changed => $value);
		2296	# });
		2297
		2298	$self->add ($self->{slider}, $self->{entry});
		2299
		2300	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2301
		2302	$self
		2303	}
		2304
		2305	sub set_range { shift->{slider}->set_range (@_) }
		2306	sub set_value { shift->{slider}->set_value (@_) }
2147		2307
2148	#############################################################################	2308	#############################################################################
2149		2309
2150	package CFClient::UI::TextView;	2310	package CFClient::UI::TextView;
2151		2311
…		…
2181		2341
2182	$self->{fontsize} = $fontsize;	2342	$self->{fontsize} = $fontsize;
2183	$self->reflow;	2343	$self->reflow;
2184	}	2344	}
2185		2345
2186	sub text_height {
2187	my ($self, $text) = @_;
2188
2189	my $layout = $self->{layout};
2190
2191	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2192	$layout->set_width ($self->{children}[0]{w});
2193	$layout->set_markup ($text);
2194
2195	($layout->size)[1]
2196	}
2197
2198	sub reflow {
2199	my ($self) = @_;
2200
2201	$self->{need_reflow}++;
2202	$self->update;
2203	}
2204
2205	sub size_allocate {	2346	sub size_allocate {
2206	my ($self, $w, $h) = @_;	2347	my ($self, $w, $h) = @_;
2207		2348
2208	$self->SUPER::size_allocate ($w, $h);	2349	$self->SUPER::size_allocate ($w, $h);
2209		2350
…		…
2212	$self->{layout}->set_width ($self->{children}[0]{w});	2353	$self->{layout}->set_width ($self->{children}[0]{w});
2213		2354
2214	$self->reflow;	2355	$self->reflow;
2215	}	2356	}
2216		2357
		2358	sub text_size {
		2359	my ($self, $text, $indent) = @_;
		2360
		2361	my $layout = $self->{layout};
		2362
		2363	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2364	$layout->set_width ($self->{children}[0]{w} - $indent);
		2365	$layout->set_markup ($text);
		2366
		2367	$layout->size
		2368	}
		2369
		2370	sub reflow {
		2371	my ($self) = @_;
		2372
		2373	$self->{need_reflow}++;
		2374	$self->update;
		2375	}
		2376
		2377	sub set_offset {
		2378	my ($self, $offset) = @_;
		2379
		2380	# todo: base offset on lines or so, not on pixels
		2381	$self->{children}[1]->set_value ($offset);
		2382	}
		2383
		2384	sub clear {
		2385	my ($self) = @_;
		2386
		2387	$self->{par} = [];
		2388	$self->{height} = 0;
		2389	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2390	}
		2391
2217	sub add_paragraph {	2392	sub add_paragraph {
2218	my ($self, $color, $text) = @_;	2393	my ($self, $color, $text, $indent) = @_;
2219		2394
2220	#TODO: intelligently "reformat" paragraph	2395	for my $line (split /\n/, $text) {
2221		2396	my ($w, $h) = $self->text_size ($line);
2222	my $height = $self->text_height ($text);
2223
2224	$self->{height} += $height;	2397	$self->{height} += $h;
		2398	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2399	}
2225		2400
2226	push @{$self->{par}}, [$height, $color, $text];
2227
2228	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2401	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2229	$self->{children}[1]->update;
2230	}	2402	}
2231		2403
2232	sub update {	2404	sub update {
2233	my ($self) = @_;	2405	my ($self) = @_;
2234		2406
…		…
2237	return unless $self->{h} > 0;	2409	return unless $self->{h} > 0;
2238		2410
2239	delete $self->{texture};	2411	delete $self->{texture};
2240		2412
2241	$ROOT->on_post_alloc ($self, sub {	2413	$ROOT->on_post_alloc ($self, sub {
		2414	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2415
2242	if (delete $self->{need_reflow}) {	2416	if (delete $self->{need_reflow}) {
2243	my $height = 0;	2417	my $height = 0;
2244		2418
2245	$height += $_->[0] = $self->text_height ($_->[2])	2419	my $layout = $self->{layout};
		2420
		2421	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2422
2246	for @{$self->{par}};	2423	for (@{$self->{par}}) {
		2424	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2425	$layout->set_width ($W - $_->[3]);
		2426	$layout->set_markup ($_->[4]);
		2427	my ($w, $h) = $layout->size;
		2428	$_->[0] = $w + $_->[3];
		2429	$_->[1] = $h;
		2430	}
		2431
		2432	$height += $_->[1];
		2433	}
2247		2434
2248	$self->{height} = $height;	2435	$self->{height} = $height;
2249		2436
2250	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2437	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2251		2438
2252	delete $self->{texture};	2439	delete $self->{texture};
2253	}	2440	}
2254		2441
2255	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2442	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2256	glClearColor 0, 0, 0, 0;	2443	glClearColor 0.5, 0.5, 0.5, 0;
2257	glClear GL_COLOR_BUFFER_BIT;	2444	glClear GL_COLOR_BUFFER_BIT;
2258		2445
2259	glEnable GL_TEXTURE_2D;
2260	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262	my $top = int $self->{children}[1]{range}[0];	2446	my $top = int $self->{children}[1]{range}[0];
2263		2447
2264	my $y0 = $top;	2448	my $y0 = $top;
2265	my $y1 = $top + $self->{h};	2449	my $y1 = $top + $H;
2266		2450
2267	my $y = 0;	2451	my $y = 0;
2268		2452
2269	my $layout = $self->{layout};	2453	my $layout = $self->{layout};
2270		2454
2271	$layout->set_font ($self->{font}) if $self->{font};	2455	$layout->set_font ($self->{font}) if $self->{font};
2272		2456
		2457	glEnable GL_BLEND;
		2458	#TODO# not correct in windows where rgba is forced off
		2459	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2460
2273	for my $par (@{$self->{par}}) {	2461	for my $par (@{$self->{par}}) {
2274	my $h = $par->[0];	2462	my $h = $par->[1];
2275		2463
2276	if ($y0 < $y + $h && $y < $y1) {	2464	if ($y0 < $y + $h && $y < $y1) {
2277	$layout->set_foreground (@{ $par->[1] });	2465	$layout->set_foreground (@{ $par->[2] });
		2466	$layout->set_width ($W - $par->[3]);
2278	$layout->set_markup ($par->[2]);	2467	$layout->set_markup ($par->[4]);
2279		2468
2280	my ($W, $H) = $layout->size;	2469	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2281	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2470
		2471	glRasterPos $par->[3], $y - $y0;
		2472	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282	}	2473	}
2283		2474
2284	$y += $h;	2475	$y += $h;
2285	}	2476	}
2286		2477
2287	glDisable GL_TEXTURE_2D;	2478	glDisable GL_BLEND;
2288	};	2479	};
2289	});	2480	});
2290	}	2481	}
2291		2482
2292	sub _draw {	2483	sub _draw {
2293	my ($self) = @_;	2484	my ($self) = @_;
2294		2485
2295	glEnable GL_TEXTURE_2D;	2486	glEnable GL_TEXTURE_2D;
2296	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2487	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2297	glColor 1, 1, 1, 1;	2488	glColor 1, 1, 1, 1;
2298	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2489	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2299	glDisable GL_TEXTURE_2D;	2490	glDisable GL_TEXTURE_2D;
2300		2491
2301	$self->{children}[1]->draw;	2492	$self->{children}[1]->draw;
2302		2493
2303	}	2494	}
…		…
2372		2563
2373	# TODO: use animation	2564	# TODO: use animation
2374	if ($self->{state} = !$self->{state}) {	2565	if ($self->{state} = !$self->{state}) {
2375	$CFClient::UI::ROOT->add ($self->{other});	2566	$CFClient::UI::ROOT->add ($self->{other});
2376	$self->{other}->move ($self->coord2global (0, $self->{h}));	2567	$self->{other}->move ($self->coord2global (0, $self->{h}));
2377	$self->emit ("open");	2568	$self->_emit ("open");
2378	} else {	2569	} else {
2379	$CFClient::UI::ROOT->remove ($self->{other});	2570	$CFClient::UI::ROOT->remove ($self->{other});
2380	$self->emit ("close");	2571	$self->_emit ("close");
2381	}	2572	}
2382		2573
2383	$self->emit (changed => $self->{state});	2574	$self->_emit (changed => $self->{state});
2384	}	2575	}
2385		2576
2386	#############################################################################	2577	#############################################################################
2387		2578
2388	package CFClient::UI::Tooltip;	2579	package CFClient::UI::Tooltip;
…		…
2402		2593
2403	sub set_tooltip_from {	2594	sub set_tooltip_from {
2404	my ($self, $widget) = @_;	2595	my ($self, $widget) = @_;
2405		2596
2406	$self->add (new CFClient::UI::Label	2597	$self->add (new CFClient::UI::Label
2407	markup => $widget->{tooltip},	2598	markup => $widget->{tooltip},
2408	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409	fontsize => 0.8,	2600	fontsize => 0.8,
2410	fg => [0, 0, 0, 1],	2601	fg => [0, 0, 0, 1],
		2602	ellipsise => 0,
2411	font => ($widget->{tooltip_font} || $::FONT_PROP),	2603	font => ($widget->{tooltip_font} || $::FONT_PROP),
2412	);	2604	);
2413	}	2605	}
2414		2606
2415	sub size_request {	2607	sub size_request {
2416	my ($self) = @_;	2608	my ($self) = @_;
…		…
2462	use CFClient::OpenGL;	2654	use CFClient::OpenGL;
2463		2655
2464	sub new {	2656	sub new {
2465	my $class = shift;	2657	my $class = shift;
2466		2658
2467	$class->SUPER::new (	2659	my $self = $class->SUPER::new (
2468	aspect => 1,	2660	aspect => 1,
		2661	can_events => 0,
2469	@_,	2662	@_,
2470	)	2663	);
		2664
		2665	if ($self->{anim} && $self->{animspeed}) {
		2666	Scalar::Util::weaken (my $widget = $self);
		2667
		2668	$self->{timer} = Event->timer (
		2669	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2670	hard => 1,
		2671	interval => $self->{animspeed},
		2672	cb => sub {
		2673	++$widget->{frame};
		2674	$widget->update;
		2675	},
		2676	);
		2677	}
		2678
		2679	$self
2471	}	2680	}
2472		2681
2473	sub size_request {	2682	sub size_request {
2474	(32, 8)	2683	(32, 8)
2475	}	2684	}
2476		2685
		2686	sub update {
		2687	my ($self) = @_;
		2688
		2689	return unless $self->{visible};
		2690
		2691	$self->SUPER::update;
		2692	}
		2693
2477	sub _draw {	2694	sub _draw {
2478	my ($self) = @_;	2695	my ($self) = @_;
2479		2696
2480	return unless $::CONN;#d# manage and cache textures differently	2697	return unless $::CONN;
		2698
		2699	my $face;
		2700
		2701	if ($self->{frame}) {
		2702	my $anim = $::CONN->{anim}[$self->{anim}];
		2703
		2704	$face = $anim->[ $self->{frame} % @$anim ]
		2705	if $anim && @$anim;
		2706	}
		2707
2481	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2708	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2482		2709
2483	# TODO animation
2484	if ($tex) {	2710	if ($tex) {
2485	glEnable GL_TEXTURE_2D;	2711	glEnable GL_TEXTURE_2D;
2486	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487	glColor 1, 1, 1, 1;	2713	glColor 1, 1, 1, 1;
2488	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2714	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489	glDisable GL_TEXTURE_2D;	2715	glDisable GL_TEXTURE_2D;
2490	}	2716	}
2491	}	2717	}
2492		2718
		2719	sub DESTROY {
		2720	my ($self) = @_;
		2721
		2722	$self->{timer}->cancel
		2723	if $self->{timer};
		2724
		2725	$self->SUPER::DESTROY;
		2726	}
		2727
2493	#############################################################################	2728	#############################################################################
2494		2729
2495	package CFClient::UI::InventoryItem;	2730	package CFClient::UI::Inventory;
2496		2731
2497	our @ISA = CFClient::UI::HBox::;	2732	our @ISA = CFClient::UI::ScrolledWindow::;
2498		2733
2499	sub new {	2734	sub new {
2500	my $class = shift;	2735	my $class = shift;
2501		2736
2502	my %args = @_;
2503
2504	my $item = delete $args{item};
2505
2506	my $desc = $item->{nrof} < 2
2507	? $item->{name}
2508	: "$item->{nrof} $item->{name_pl}";
2509
2510	$item->{flags} & Crossfire::Protocol::F_OPEN
2511	and $desc .= " (open)";
2512	$item->{flags} & Crossfire::Protocol::F_APPLIED
2513	and $desc .= " (applied)";
2514	$item->{flags} & Crossfire::Protocol::F_UNPAID
2515	and $desc .= " (unpaid)";
2516	$item->{flags} & Crossfire::Protocol::F_MAGIC
2517	and $desc .= " (magic)";
2518	$item->{flags} & Crossfire::Protocol::F_CURSED
2519	and $desc .= " (cursed)";
2520	$item->{flags} & Crossfire::Protocol::F_DAMNED
2521	and $desc .= " (damned)";
2522	$item->{flags} & Crossfire::Protocol::F_LOCKED
2523	and $desc .= " *";
2524
2525	my $self = $class->SUPER::new (	2737	my $self = $class->SUPER::new (
2526	can_hover => 1,	2738	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2527	can_events => 1,
2528	tooltip => (CFClient::UI::Label->escape ($desc)
2529	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530	connect_button_down => sub {
2531	my ($self, $ev, $x, $y) = @_;
2532
2533	# todo: maybe put examine on 1? but should just be a tooltip :(
2534	if ($ev->{button} == 1) {
2535	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536	} elsif ($ev->{button} == 2) {
2537	$::CONN->send ("apply $item->{tag}");
2538	} elsif ($ev->{button} == 3) {
2539	my @menu_items = (
2540	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544	[
2545	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546	sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547	],
2548	);
2549
2550	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551	}
2552
2553	1
2554	},
2555	%args
2556	);
2557
2558	$self->add (new CFClient::UI::Face
2559	can_events => 0,
2560	face => $item->{face},
2561	anim => $item->{anim},
2562	animspeed => $item->{animspeed},
2563	);
2564
2565	$self->add (new CFClient::UI::Label
2566	can_events => 0,
2567	text => $desc,
2568	);
2569
2570	$self
2571	}
2572
2573	#############################################################################
2574
2575	package CFClient::UI::Inventory;
2576
2577	our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579	sub new {
2580	my $class = shift;
2581
2582	my $self = $class->SUPER::new (
2583	scrolled => (new CFClient::UI::VBox),
2584	@_,	2739	@_,
2585	);	2740	);
2586		2741
2587	$self	2742	$self
2588	}	2743	}
…		…
2598	or ($a->{name} cmp $b->{name})	2753	or ($a->{name} cmp $b->{name})
2599	} @$items;	2754	} @$items;
2600		2755
2601	$self->{real_items} = \@items;	2756	$self->{real_items} = \@items;
2602		2757
		2758	my $row = 0;
2603	for my $item (@items) {	2759	for my $item (@items) {
2604	my $desc = $item->{nrof} < 2	2760	CFClient::Item::update_widgets $item;
2605	? $item->{name}
2606	: "$item->{nrof} $item->{name_pl}";
2607		2761
2608	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2762	$self->{scrolled}->add (0, $row, $item->{face_widget});
2609	}	2763	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2764	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2610		2765
2611	$self->{scrolled}->add (@items);	2766	$row++;
2612		2767	}
2613	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614	}	2768	}
2615		2769
2616	sub size_request {	2770	sub size_request {
2617	my ($self) = @_;	2771	my ($self) = @_;
2618	($self->{req_w}, $self->{req_h});	2772	($self->{req_w}, $self->{req_h});
…		…
2658		2812
2659	# popup given the event (must be a mouse button down event currently)	2813	# popup given the event (must be a mouse button down event currently)
2660	sub popup {	2814	sub popup {
2661	my ($self, $ev) = @_;	2815	my ($self, $ev) = @_;
2662		2816
2663	$self->emit ("popdown");	2817	$self->_emit ("popdown");
2664		2818
2665	# maybe save $GRAB? must be careful about events...	2819	# maybe save $GRAB? must be careful about events...
2666	$GRAB = $self;	2820	$GRAB = $self;
2667	$self->{button} = $ev->{button};	2821	$self->{button} = $ev->{button};
2668		2822
…		…
2683		2837
2684	if ($ev->{button} == $self->{button}) {	2838	if ($ev->{button} == $self->{button}) {
2685	undef $GRAB;	2839	undef $GRAB;
2686	$self->hide;	2840	$self->hide;
2687		2841
2688	$self->emit ("popdown");	2842	$self->_emit ("popdown");
2689	$self->{hover}[1]->() if $self->{hover};	2843	$self->{hover}[1]->() if $self->{hover};
2690	}	2844	}
2691	}	2845	}
2692		2846
2693	#############################################################################	2847	#############################################################################
2694		2848
2695	package CFClient::UI::Statusbox;	2849	package CFClient::UI::Statusbox;
2696		2850
2697	our @ISA = CFClient::UI::VBox::;	2851	our @ISA = CFClient::UI::VBox::;
		2852
		2853	sub new {
		2854	my $class = shift;
		2855
		2856	$class->SUPER::new (
		2857	fontsize => 0.8,
		2858	@_,
		2859	)
		2860	}
2698		2861
2699	sub reorder {	2862	sub reorder {
2700	my ($self) = @_;	2863	my ($self) = @_;
2701	my $NOW = time;	2864	my $NOW = time;
2702		2865
…		…
2722	: $item->{text};	2885	: $item->{text};
2723		2886
2724	for ($short) {	2887	for ($short) {
2725	s/^\s+//;	2888	s/^\s+//;
2726	s/\s+/ /g;	2889	s/\s+/ /g;
2727	my $len = int 40 / $item->{fontsize};
2728	substr $_, $len, length, "…" if $len < length;
2729	}	2890	}
2730		2891
2731	new CFClient::UI::Label	2892	new CFClient::UI::Label
2732	markup => $short,	2893	markup => $short,
2733	tooltip => $item->{tooltip},	2894	tooltip => $item->{tooltip},
2734	tooltip_font => $::FONT_PROP,	2895	tooltip_font => $::FONT_PROP,
2735	tooltip_width => 0.67,	2896	tooltip_width => 0.67,
2736	fontsize => $item->{fontsize},	2897	fontsize => $item->{fontsize} || $self->{fontsize},
		2898	max_w => $::WIDTH * 0.44,
2737	fg => $item->{fg},	2899	fg => $item->{fg},
2738	can_events => 1,	2900	can_events => 1,
2739	can_hover => 1	2901	can_hover => 1
2740	};	2902	};
2741	}	2903	}
…		…
2747	sub add {	2909	sub add {
2748	my ($self, $text, %arg) = @_;	2910	my ($self, $text, %arg) = @_;
2749		2911
2750	$text =~ s/^\s+//;	2912	$text =~ s/^\s+//;
2751	$text =~ s/\s+$//;	2913	$text =~ s/\s+$//;
		2914
		2915	return unless $text;
2752		2916
2753	my $timeout = time + ((delete $arg{timeout}) || 60);	2917	my $timeout = time + ((delete $arg{timeout}) || 60);
2754		2918
2755	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2919	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756		2920
…		…
2768	$self->{item}{$group} = {	2932	$self->{item}{$group} = {
2769	id => ++$self->{id},	2933	id => ++$self->{id},
2770	text => $text,	2934	text => $text,
2771	timeout => $timeout,	2935	timeout => $timeout,
2772	tooltip => $text,	2936	tooltip => $text,
2773	fontsize => 0.8,
2774	fg => [0.8, 0.8, 0.8, 0.8],	2937	fg => [0.8, 0.8, 0.8, 0.8],
2775	pri => 0,	2938	pri => 0,
2776	count => 1,	2939	count => 1,
2777	%arg,	2940	%arg,
2778	};	2941	};
2779	}	2942	}
2780		2943
2781	$self->reorder;	2944	$self->reorder;
2782	}	2945	}
2783		2946
		2947	sub reconfigure {
		2948	my ($self) = @_;
		2949
		2950	delete $_->{label}
		2951	for values %{ $self->{item} || {} };
		2952
		2953	$self->reorder;
		2954	$self->SUPER::reconfigure;
		2955	}
		2956
2784	#############################################################################	2957	#############################################################################
2785		2958
2786	package CFClient::UI::Root;	2959	package CFClient::UI::Root;
2787		2960
2788	our @ISA = CFClient::UI::Container::;	2961	our @ISA = CFClient::UI::Container::;
…		…
2818	}	2991	}
2819		2992
2820	sub size_allocate {	2993	sub size_allocate {
2821	my ($self, $w, $h) = @_;	2994	my ($self, $w, $h) = @_;
2822		2995
2823	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828
2829	for my $child ($self->children) {	2996	for my $child ($self->children) {
2830	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2997	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2831		2998
2832	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	2999	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2833	if exists $child->{req_x};	3000	if exists $child->{req_x};
…		…
2862	}	3029	}
2863		3030
2864	sub add {	3031	sub add {
2865	my ($self, @children) = @_;	3032	my ($self, @children) = @_;
2866		3033
		3034	for (my @widgets = @children; my $w = pop @widgets; ) {
		3035	push @widgets, $w->children;
		3036	$w->{root} = $self;
		3037	$w->{visible} = 1;
		3038	}
		3039
2867	for my $child (@children) {	3040	for my $child (@children) {
2868	$child->{toplevel} = 1;	3041	$child->{is_toplevel} = 1;
2869		3042
2870	# integerise window positions	3043	# integerise window positions
2871	$child->{x} = int $child->{x};	3044	$child->{x} = int $child->{x};
2872	$child->{y} = int $child->{y};	3045	$child->{y} = int $child->{y};
2873	}	3046	}
2874		3047
2875	$self->SUPER::add (@children);	3048	$self->SUPER::add (@children);
		3049	}
		3050
		3051	sub remove {
		3052	my ($self, @children) = @_;
		3053
		3054	$self->SUPER::remove (@children);
		3055
		3056	while (@children) {
		3057	my $w = pop @children;
		3058	push @children, $w->children;
		3059	$w->set_invisible;
		3060	}
2876	}	3061	}
2877		3062
2878	sub on_refresh {	3063	sub on_refresh {
2879	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2880		3065
…		…
2933	$w = 0 if $w < 0;	3118	$w = 0 if $w < 0;
2934	$h = 0 if $h < 0;	3119	$h = 0 if $h < 0;
2935		3120
2936	$widget->{w} = $w;	3121	$widget->{w} = $w;
2937	$widget->{h} = $h;	3122	$widget->{h} = $h;
2938	$widget->size_allocate ($w, $h);
2939	$widget->emit (size_allocate => $w, $h);	3123	$widget->emit (size_allocate => $w, $h);
2940	}	3124	}
2941	}	3125	}
2942		3126
2943	while ($self->{post_alloc_hook}) {	3127	while ($self->{post_alloc_hook}) {
…		…
2949	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3133	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2950	glClear GL_COLOR_BUFFER_BIT;	3134	glClear GL_COLOR_BUFFER_BIT;
2951		3135
2952	glMatrixMode GL_PROJECTION;	3136	glMatrixMode GL_PROJECTION;
2953	glLoadIdentity;	3137	glLoadIdentity;
2954	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3138	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2955	glMatrixMode GL_MODELVIEW;	3139	glMatrixMode GL_MODELVIEW;
2956	glLoadIdentity;	3140	glLoadIdentity;
2957		3141
2958	$self->_draw;	3142	$self->_draw;
2959	}	3143	}
…		…
2961	#############################################################################	3145	#############################################################################
2962		3146
2963	package CFClient::UI;	3147	package CFClient::UI;
2964		3148
2965	$ROOT = new CFClient::UI::Root;	3149	$ROOT = new CFClient::UI::Root;
2966	$TOOLTIP = new CFClient::UI::Tooltip;	3150	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967		3151
2968	1	3152	1
2969		3153

Diff Legend

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