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

Diff Legend

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