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.203 by root, Sun May 14 21:13:11 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;
…		…
31	$TOOLTIP->set_tooltip_from ($widget);	32	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	33	$TOOLTIP->show;
33		34
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	35	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		36
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	}	38	if $x + $TOOLTIP->{w} > $::WIDTH;
39		39
40	$TOOLTIP->move ($x, $y);	40	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;	41	$TOOLTIP->check_size;
42	$TOOLTIP->update;	42	$TOOLTIP->update;
43	}	43	}
…		…
51	delete $TOOLTIP->{owner};	51	delete $TOOLTIP->{owner};
52	}	52	}
53		53
54	# class methods for events	54	# class methods for events
55	sub feed_sdl_key_down_event {	55	sub feed_sdl_key_down_event {
56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	56	$FOCUS->emit (key_down => $_[0])
57	if $FOCUS;	57	if $FOCUS;
58	}	58	}
59		59
60	sub feed_sdl_key_up_event {	60	sub feed_sdl_key_up_event {
61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	61	$FOCUS->emit (key_up => $_[0])
62	if $FOCUS;	62	if $FOCUS;
63	}	63	}
64		64
65	sub feed_sdl_button_down_event {	65	sub feed_sdl_button_down_event {
66	my ($ev) = @_;	66	my ($ev) = @_;
…		…
75	check_tooltip;	75	check_tooltip;
76	}	76	}
77		77
78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
79		79
80	if ($GRAB) {	80	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81	($x, $y) = $GRAB->coord2local ($x, $y);	81	if $GRAB;
82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83	}
84	}	82	}
85		83
86	sub feed_sdl_button_up_event {	84	sub feed_sdl_button_up_event {
87	my ($ev) = @_;	85	my ($ev) = @_;
88	my ($x, $y) = ($ev->{x}, $ev->{y});	86	my ($x, $y) = ($ev->{x}, $ev->{y});
89		87
90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91		89
92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93		91
94	if ($GRAB) {	92	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95	($x, $y) = $GRAB->coord2local ($x, $y);	93	if $GRAB;
96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97	}
98		94
99	if (!$BUTTON_STATE) {	95	if (!$BUTTON_STATE) {
100	my $grab = $GRAB; undef $GRAB;	96	my $grab = $GRAB; undef $GRAB;
101	$grab->update if $grab;	97	$grab->update if $grab;
102	$GRAB->update if $GRAB;	98	$GRAB->update if $GRAB;
…		…
118	$HOVER->update if $HOVER && $HOVER->{can_hover};	114	$HOVER->update if $HOVER && $HOVER->{can_hover};
119		115
120	check_tooltip;	116	check_tooltip;
121	}	117	}
122		118
123	if ($HOVER) {
124	($x, $y) = $HOVER->coord2local ($x, $y);
125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	119	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126	}	120	if $HOVER;
127	}	121	}
128		122
129	# convert position array to integers	123	# convert position array to integers
130	sub harmonize {	124	sub harmonize {
131	my ($vals) = @_;	125	my ($vals) = @_;
…		…
137	$rem += $_ - $i;	131	$rem += $_ - $i;
138	$_ = $i;	132	$_ = $i;
139	}	133	}
140	}	134	}
141		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
142	# call when resolution changes etc.	152	# call when resolution changes etc.
143	sub rescale_widgets {	153	sub rescale_widgets {
144	my ($sx, $sy) = @_;	154	my ($sx, $sy) = @_;
145		155
146	for my $widget (values %WIDGET) {	156	for my $widget (values %WIDGET) {
147	if ($widget->{toplevel}) {	157	if ($widget->{is_toplevel}) {
148	$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};
149	$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};
150	$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};
151	$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};
152	$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};
153	$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};
154	$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};
155	$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};
156	}	166	}
157
158	$widget->reconfigure;
159	}	167	}
		168
		169	reconfigure_widgets;
160	}	170	}
161		171
162	#############################################################################	172	#############################################################################
163		173
164	package CFClient::UI::Base;	174	package CFClient::UI::Base;
…		…
196	%$self = ();	206	%$self = ();
197	}	207	}
198		208
199	sub show {	209	sub show {
200	my ($self) = @_;	210	my ($self) = @_;
201
202	return if $self->{parent};	211	return if $self->{parent};
203		212
204	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
205	}	214	}
206		215
207	sub hide {	216	sub show_centered {
208	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};
209		235
210	undef $GRAB if $GRAB == $self;	236	undef $GRAB if $GRAB == $self;
211	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;
212		249
213	$self->{parent}->remove ($self)	250	$self->{parent}->remove ($self)
214	if $self->{parent};	251	if $self->{parent};
215	}	252	}
216		253
…		…
283		320
284	delete $self->{max_w}; $self->{max_w} = $w if $w;	321	delete $self->{max_w}; $self->{max_w} = $w if $w;
285	delete $self->{max_h}; $self->{max_h} = $h if $h;	322	delete $self->{max_h}; $self->{max_h} = $h if $h;
286	}	323	}
287		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
288	# translate global coordinates to local coordinate system	341	# translate global coordinates to local coordinate system
289	sub coord2local {	342	sub coord2local {
290	my ($self, $x, $y) = @_;	343	my ($self, $x, $y) = @_;
291		344
292	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	345	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
305	return if $FOCUS == $self;	358	return if $FOCUS == $self;
306	return unless $self->{can_focus};	359	return unless $self->{can_focus};
307		360
308	my $focus = $FOCUS; $FOCUS = $self;	361	my $focus = $FOCUS; $FOCUS = $self;
309		362
310	$self->emit (focus_in => $focus);	363	$self->_emit (focus_in => $focus);
311		364
312	$focus->update if $focus;	365	$focus->update if $focus;
313	$FOCUS->update;	366	$FOCUS->update;
314	}	367	}
315		368
…		…
318		371
319	return unless $FOCUS == $self;	372	return unless $FOCUS == $self;
320		373
321	my $focus = $FOCUS; undef $FOCUS;	374	my $focus = $FOCUS; undef $FOCUS;
322		375
323	$self->emit (focus_out => $focus);	376	$self->_emit (focus_out => $focus);
324		377
325	$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;
326	}	382	}
327		383
328	sub mouse_motion { }	384	sub mouse_motion { }
329	sub button_up { }	385	sub button_up { }
330	sub key_down { }	386	sub key_down { }
331	sub key_up { }	387	sub key_up { }
332		388
333	sub button_down {	389	sub button_down {
334	my ($self, $ev, $x, $y) = @_;	390	my ($self, $ev, $x, $y) = @_;
335		391
336	$self->focus_in;	392	$self->focus_in;
…		…
370	if ($ENV{PCLIENT_DEBUG}) {	426	if ($ENV{PCLIENT_DEBUG}) {
371	glPushMatrix;	427	glPushMatrix;
372	glColor 1, 1, 0, 1;	428	glColor 1, 1, 0, 1;
373	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	429	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374	glBegin GL_LINE_LOOP;	430	glBegin GL_LINE_LOOP;
375	glVertex 0 , 0;	431	glVertex 0 , 0;
376	glVertex $self->{w}, 0;	432	glVertex $self->{w} - 1, 0;
377	glVertex $self->{w}, $self->{h};	433	glVertex $self->{w} - 1, $self->{h} - 1;
378	glVertex 0 , $self->{h};	434	glVertex 0 , $self->{h} - 1;
379	glEnd;	435	glEnd;
380	glPopMatrix;	436	glPopMatrix;
381	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;
382	}	438	}
383	}	439	}
384		440
385	sub _draw {	441	sub _draw {
386	my ($self) = @_;	442	my ($self) = @_;
…		…
403	sub set_parent {	459	sub set_parent {
404	my ($self, $parent) = @_;	460	my ($self, $parent) = @_;
405		461
406	Scalar::Util::weaken ($self->{parent} = $parent);	462	Scalar::Util::weaken ($self->{parent} = $parent);
407		463
		464	$self->{root} = $parent->{root};
		465	$self->{visible} = $parent->{visible};
		466
408	# TODO: req_w _does_change after ->reconfigure	467	# TODO: req_w _does_change after ->reconfigure
409	$self->check_size	468	$self->check_size
410	unless exists $self->{req_w};	469	unless exists $self->{req_w};
		470
		471	$self->show;
411	}	472	}
412		473
413	sub check_size {	474	sub check_size {
414	my ($self, $forced) = @_;	475	my ($self, $forced) = @_;
415		476
…		…
428	my ($self, $signal, $cb) = @_;	489	my ($self, $signal, $cb) = @_;
429		490
430	push @{ $self->{signal_cb}{$signal} }, $cb;	491	push @{ $self->{signal_cb}{$signal} }, $cb;
431	}	492	}
432		493
		494	sub _emit {
		495	my ($self, $signal, @args) = @_;
		496
		497	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		498	}
		499
433	sub emit {	500	sub emit {
434	my ($self, $signal, @args) = @_;	501	my ($self, $signal, @args) = @_;
435		502
436	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	503	$self->_emit ($signal, @args)
		504	|| $self->$signal (@args);
437	}	505	}
438		506
439	sub DESTROY {	507	sub DESTROY {
440	my ($self) = @_;	508	my ($self) = @_;
441		509
…		…
456	my $class = shift;	524	my $class = shift;
457		525
458	# range [value, low, high, page]	526	# range [value, low, high, page]
459		527
460	$class->SUPER::new (	528	$class->SUPER::new (
461	bg => [0, 0, 0, 0.2],	529	#bg => [0, 0, 0, 0.2],
462	active_bg => [1, 1, 1, 0.5],	530	#active_bg => [1, 1, 1, 0.5],
463	@_	531	@_
464	)	532	)
465	}	533	}
466		534
467	sub _draw {	535	sub _draw {
468	my ($self) = @_;	536	my ($self) = @_;
469		537
		538	my $color = $FOCUS == $self && $self->{active_bg}
		539	? $self->{active_bg}
		540	: $self->{bg};
		541
		542	if ($color && (@$color < 4 || $color->[3])) {
470	my ($w, $h) = @$self{qw(w h)};	543	my ($w, $h) = @$self{qw(w h)};
471		544
472	glEnable GL_BLEND;	545	glEnable GL_BLEND;
473	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	547	glColor @$color;
475		548
476	glBegin GL_QUADS;	549	glBegin GL_QUADS;
477	glVertex 0 , 0;	550	glVertex 0 , 0;
478	glVertex 0 , $h;	551	glVertex 0 , $h;
479	glVertex $w, $h;	552	glVertex $w, $h;
480	glVertex $w, 0;	553	glVertex $w, 0;
481	glEnd;	554	glEnd;
482		555
483	glDisable GL_BLEND;	556	glDisable GL_BLEND;
		557	}
484	}	558	}
485		559
486	#############################################################################	560	#############################################################################
487		561
488	package CFClient::UI::Empty;	562	package CFClient::UI::Empty;
…		…
548	delete $child->{parent};	622	delete $child->{parent};
549	$child->hide;	623	$child->hide;
550		624
551	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	625	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552		626
553	$self->check_size;	627	$self->check_size (1);
554	$self->update;	628	$self->update;
555	}	629	}
556		630
557	sub clear {	631	sub clear {
558	my ($self) = @_;	632	my ($self) = @_;
…		…
672	$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 {
673	glClearColor 0, 0, 0, 0;	747	glClearColor 0, 0, 0, 0;
674	glClear GL_COLOR_BUFFER_BIT;	748	glClear GL_COLOR_BUFFER_BIT;
675		749
676	$self->_render;	750	$self->_render;
677	# glColorMask 1, 1, 1, 0;
678	# glEnable GL_BLEND;
679	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680	# glRasterPos 0, 0;
681	# glCopyPixels 0, 0, $self->{w}, $self->{h};
682	# glDisable GL_BLEND;
683	# glColorMask 1, 1, 1, 1;
684	};	751	};
685	}	752	}
686		753
687	sub _draw {	754	sub _draw {
688	my ($self) = @_;	755	my ($self) = @_;
…		…
692	my $tex = $self->{texture}	759	my $tex = $self->{texture}
693	or return;	760	or return;
694		761
695	glEnable GL_TEXTURE_2D;	762	glEnable GL_TEXTURE_2D;
696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	763	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697	glColor 0, 0, 0, 1;	764	glColor 1, 1, 1, 1;
698		765
699	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	766	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700		767
701	glDisable GL_TEXTURE_2D;	768	glDisable GL_TEXTURE_2D;
702	}	769	}
…		…
705		772
706	package CFClient::UI::ViewPort;	773	package CFClient::UI::ViewPort;
707		774
708	our @ISA = CFClient::UI::Window::;	775	our @ISA = CFClient::UI::Window::;
709		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
710	sub size_request {	787	sub size_request {
711	my ($self) = @_;	788	my ($self) = @_;
712		789
713	@$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)};
714	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
715		791
716	@$self{qw(child_w child_h)}	792	@$self{qw(child_w child_h)}
717	}	793	}
718		794
719	sub size_allocate {	795	sub size_allocate {
720	my ($self, $w, $h) = @_;	796	my ($self, $w, $h) = @_;
721		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);
722	$self->update;	802	$self->update;
723	}	803	}
724		804
725	sub set_offset {	805	sub set_offset {
726	my ($self, $x, $y) = @_;	806	my ($self, $x, $y) = @_;
…		…
780		860
781	my $slider = new CFClient::UI::Slider	861	my $slider = new CFClient::UI::Slider
782	vertical => 1,	862	vertical => 1,
783	range => [0, 0, 1, 0.01], # HACK fix	863	range => [0, 0, 1, 0.01], # HACK fix
784	connect_changed => sub {	864	connect_changed => sub {
785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	865	$self->{vp}->set_offset (0, $_[1]);
786	},	866	},
787	;	867	;
788		868
789	$self = $class->SUPER::new (	869	$self = $class->SUPER::new (
790	vp => (new CFClient::UI::ViewPort),	870	vp => (new CFClient::UI::ViewPort expand => 1),
791	slider => $slider,	871	slider => $slider,
792	@_,	872	@_,
793	);	873	);
794		874
795	$self->{vp}->add ($self->{scrolled});	875	$self->{vp}->add ($self->{scrolled});
796	$self->add ($self->{vp});	876	$self->add ($self->{vp});
797	$self->add ($self->{slider});	877	$self->add ($self->{slider});
798		878
799	$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]);
800	}	899	}
801		900
802	#TODO# update range on size_allocate depending on child	901	#TODO# update range on size_allocate depending on child
803	# update viewport offset on scroll	902	# update viewport offset on scroll
804		903
…		…
858	my $class = shift;	957	my $class = shift;
859		958
860	# TODO: user_x, user_y, overwrite moveto?	959	# TODO: user_x, user_y, overwrite moveto?
861		960
862	my $self = $class->SUPER::new (	961	my $self = $class->SUPER::new (
863	bg => [1, 1, 1, 1],	962	bg => [1, 1, 1, 1],
864	border_bg => [1, 1, 1, 1],	963	border_bg => [1, 1, 1, 1],
865	border => 0.6,	964	border => 0.6,
866	toplevel => 1,	965	is_toplevel => 1,
867	can_events => 1,	966	can_events => 1,
868	@_	967	@_
869	);	968	);
870		969
871	$self->{title} &&= new CFClient::UI::Label	970	$self->{title} &&= new CFClient::UI::Label
872	align => 0,	971	align => 0,
…		…
896	my ($self, $w, $h) = @_;	995	my ($self, $w, $h) = @_;
897		996
898	$h -= List::Util::max 0, $self->border * 2;	997	$h -= List::Util::max 0, $self->border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	998	$w -= List::Util::max 0, $self->border * 2;
900		999
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1000	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902	if $self->{title};	1001	if $self->{title};
903		1002
904	$self->child->configure ($self->border, $self->border, $w, $h);	1003	$self->child->configure ($self->border, $self->border, $w, $h);
905	}	1004	}
906		1005
…		…
1012	sub new {	1111	sub new {
1013	my $class = shift;	1112	my $class = shift;
1014		1113
1015	$class->SUPER::new (	1114	$class->SUPER::new (
1016	col_expand => [],	1115	col_expand => [],
1017	@_	1116	@_,
1018	)	1117	)
		1118	}
		1119
		1120	sub children {
		1121	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019	}	1122	}
1020		1123
1021	sub add {	1124	sub add {
1022	my ($self, $x, $y, $child) = @_;	1125	my ($self, $x, $y, $child) = @_;
1023		1126
1024	$child->set_parent ($self);	1127	$child->set_parent ($self);
1025	$self->{children}[$y][$x] = $child;	1128	$self->{children}[$y][$x] = $child;
1026		1129
1027	$child->check_size;	1130	$self->check_size (1);
1028	}	1131	}
1029		1132
1030	sub children {
1031	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032	}
1033
1034	# 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?
1035	sub clear {	1134	sub clear {
1036	my ($self) = @_;	1135	my ($self) = @_;
1037		1136
1038	my @children = $self->children;	1137	my @children = $self->children;
1039	delete $self->{children};	1138	delete $self->{children};
…		…
1041	for (@children) {	1140	for (@children) {
1042	delete $_->{parent};	1141	delete $_->{parent};
1043	$_->hide;	1142	$_->hide;
1044	}	1143	}
1045		1144
		1145	$self->check_size (1);
1046	$self->update;	1146	$self->update;
1047	}	1147	}
1048		1148
1049	sub get_wh {	1149	sub get_wh {
1050	my ($self) = @_;	1150	my ($self) = @_;
…		…
1082	sub size_allocate {	1182	sub size_allocate {
1083	my ($self, $w, $h) = @_;	1183	my ($self, $w, $h) = @_;
1084		1184
1085	my ($ws, $hs) = $self->get_wh;	1185	my ($ws, $hs) = $self->get_wh;
1086		1186
1087	my $req_w = sum @$ws;	1187	my $req_w = (sum @$ws) || 1;
1088	my $req_h = sum @$hs;	1188	my $req_h = (sum @$hs) || 1;
1089		1189
1090	# TODO: nicer code && do row_expand	1190	# TODO: nicer code && do row_expand
1091	my @col_expand = @{$self->{col_expand}};	1191	my @col_expand = @{$self->{col_expand}};
1092	@col_expand = (1) x @$ws unless @col_expand;	1192	@col_expand = (1) x @$ws unless @col_expand;
1093	my $col_expand = (sum @col_expand) || 1;	1193	my $col_expand = (sum @col_expand) || 1;
…		…
1267		1367
1268	#############################################################################	1368	#############################################################################
1269		1369
1270	package CFClient::UI::Label;	1370	package CFClient::UI::Label;
1271		1371
1272	our @ISA = CFClient::UI::Base::;	1372	our @ISA = CFClient::UI::DrawBG::;
1273		1373
1274	use CFClient::OpenGL;	1374	use CFClient::OpenGL;
1275		1375
1276	sub new {	1376	sub new {
1277	my ($class, %arg) = @_;	1377	my ($class, %arg) = @_;
1278		1378
1279	my $self = $class->SUPER::new (	1379	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1380	fg => [1, 1, 1],
		1381	#bg => none
		1382	#active_bg => none
1281	#font => default_font	1383	#font => default_font
1282	#text => initial text	1384	#text => initial text
1283	#markup => initial narkup	1385	#markup => initial narkup
		1386	#max_w => maximum pixel width
		1387	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1388	layout => (new CFClient::Layout),
1285	fontsize => 1,	1389	fontsize => 1,
1286	align => -1,	1390	align => -1,
1287	valign => -1,	1391	valign => -1,
1288	padding => 2,	1392	padding => 2,
…		…
1303	}	1407	}
1304		1408
1305	$self	1409	$self
1306	}	1410	}
1307		1411
1308	sub escape {	1412	sub escape($) {
1309	local $_ = $_[1];	1413	local $_ = $_[0];
1310		1414
1311	s/&/&amp;/g;	1415	s/&/&amp;/g;
1312	s/>/&gt;/g;	1416	s/>/&gt;/g;
1313	s/</&lt;/g;	1417	s/</&lt;/g;
1314		1418
1315	$_[1]	1419	$_
1316	}	1420	}
1317		1421
1318	sub update {	1422	sub update {
1319	my ($self) = @_;	1423	my ($self) = @_;
1320		1424
…		…
1353	sub size_request {	1457	sub size_request {
1354	my ($self) = @_;	1458	my ($self) = @_;
1355		1459
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1460	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$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});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1464	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1465
1360	my ($w, $h) = $self->{layout}->size;	1466	my ($w, $h) = $self->{layout}->size;
1361		1467
1362	if (exists $self->{template}) {	1468	if (exists $self->{template}) {
…		…
1392	}	1498	}
1393		1499
1394	sub _draw {	1500	sub _draw {
1395	my ($self) = @_;	1501	my ($self) = @_;
1396		1502
		1503	$self->SUPER::_draw; # draw background, if applicable
		1504
1397	my $tex = $self->{texture} ||= do {	1505	my $tex = $self->{texture} ||= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1506	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1507	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$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});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1511	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1512
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1513	my $tex = new_from_layout CFClient::Texture $self->{layout};
1404		1514
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1515	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1516	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1517	: ($self->{w} - $tex->{w}) * 0.5);
1408		1518
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1519	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1520	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1521	: ($self->{h} - $tex->{h}) * 0.5);
1412		1522
1413	$tex	1523	$tex
1414	};	1524	};
1415		1525
1416	glEnable GL_TEXTURE_2D;	1526	glEnable GL_TEXTURE_2D;
…		…
1444	active_fg => [0, 0, 0],	1554	active_fg => [0, 0, 0],
1445	can_hover => 1,	1555	can_hover => 1,
1446	can_focus => 1,	1556	can_focus => 1,
1447	valign => 0,	1557	valign => 0,
1448	can_events => 1,	1558	can_events => 1,
		1559	#text => ...
1449	@_	1560	@_
1450	)	1561	)
1451	}	1562	}
1452		1563
1453	sub _set_text {	1564	sub _set_text {
…		…
1463	$self->{text} = $text;	1574	$self->{text} = $text;
1464		1575
1465	$text =~ s/./*/g if $self->{hidden};	1576	$text =~ s/./*/g if $self->{hidden};
1466	$self->{layout}->set_text ("$text ");	1577	$self->{layout}->set_text ("$text ");
1467		1578
1468	$self->emit (changed => $self->{text});	1579	$self->_emit (changed => $self->{text});
1469	}	1580	}
1470		1581
1471	sub set_text {	1582	sub set_text {
1472	my ($self, $text) = @_;	1583	my ($self, $text) = @_;
1473		1584
1474	$self->{cursor} = length $text;	1585	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1586	$self->_set_text ($text);
		1587	$self->update;
1476	$self->check_size;	1588	$self->check_size;
1477	$self->update;
1478	}	1589	}
1479		1590
1480	sub get_text {	1591	sub get_text {
1481	$_[0]{text}	1592	$_[0]{text}
1482	}	1593	}
…		…
1485	my ($self) = @_;	1596	my ($self) = @_;
1486		1597
1487	my ($w, $h) = $self->SUPER::size_request;	1598	my ($w, $h) = $self->SUPER::size_request;
1488		1599
1489	($w + 1, $h) # add 1 for cursor	1600	($w + 1, $h) # add 1 for cursor
1490	}
1491
1492	sub size_allocate {
1493	my ($self, $w, $h) = @_;
1494
1495	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496	}	1601	}
1497		1602
1498	sub key_down {	1603	sub key_down {
1499	my ($self, $ev) = @_;	1604	my ($self, $ev) = @_;
1500		1605
…		…
1515	} elsif ($sym == CFClient::SDLK_HOME) {	1620	} elsif ($sym == CFClient::SDLK_HOME) {
1516	$self->{cursor} = 0;	1621	$self->{cursor} = 0;
1517	} elsif ($sym == CFClient::SDLK_END) {	1622	} elsif ($sym == CFClient::SDLK_END) {
1518	$self->{cursor} = length $text;	1623	$self->{cursor} = length $text;
1519	} elsif ($uni == 27) {	1624	} elsif ($uni == 27) {
1520	$self->emit ('escape');	1625	$self->_emit ('escape');
1521	} elsif ($uni) {	1626	} elsif ($uni) {
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1627	substr $text, $self->{cursor}++, 0, chr $uni;
1523	}	1628	}
1524		1629
1525	$self->_set_text ($text);	1630	$self->_set_text ($text);
1526	$self->update;	1631	$self->update;
		1632	$self->check_size;
1527	}	1633	}
1528		1634
1529	sub focus_in {	1635	sub focus_in {
1530	my ($self) = @_;	1636	my ($self) = @_;
1531		1637
…		…
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) = @_;
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2119	qw(s1_slider.png s1_slider_bg.png);
2012		2120
2013	sub new {	2121	sub new {
2014	my $class = shift;	2122	my $class = shift;
2015		2123
2016	# range [value, low, high, page]	2124	# range [value, low, high, page, unit]
2017		2125
2018	# TODO: 0-width page	2126	# TODO: 0-width page
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 => 5,	2139	inner_pad => 0.02,
2030	@_	2140	@_
2031	);	2141	);
2032		2142
		2143	$self->set_value ($self->{range}[0]);
		2144	$self->update;
		2145
2033	$self	2146	$self
		2147	}
		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
		2158	sub set_value {
		2159	my ($self, $value) = @_;
		2160
		2161	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2162
		2163	$hi = $lo + 1 if $hi <= $lo;
		2164
		2165	$page = $hi - $lo if $page > $hi - $lo;
		2166
		2167	$value = $lo if $value < $lo;
		2168	$value = $hi - $page if $value > $hi - $page;
		2169
		2170	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2171	if $unit;
		2172
		2173	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2174
		2175	if ($value != $old_value) {
		2176	$self->_emit (changed => $value);
		2177	$self->update;
		2178	}
2034	}	2179	}
2035		2180
2036	sub size_request {	2181	sub size_request {
2037	my ($self) = @_;	2182	my ($self) = @_;
2038		2183
…		…
2044		2189
2045	sub button_down {	2190	sub button_down {
2046	my ($self, $ev, $x, $y) = @_;	2191	my ($self, $ev, $x, $y) = @_;
2047		2192
2048	$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
2049	$self->mouse_motion ($ev, $x, $y);	2197	$self->mouse_motion ($ev, $x, $y);
2050	}	2198	}
2051		2199
2052	sub mouse_motion {	2200	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2201	my ($self, $ev, $x, $y) = @_;
2054		2202
2055	if ($GRAB == $self) {	2203	if ($GRAB == $self) {
		2204	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2205
		2206	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2207
		2208	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2209
		2210	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2211	}
		2212	}
		2213
		2214	sub update {
		2215	my ($self) = @_;
		2216
		2217	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2218	$self->set_value ($self->{range}[0]);
		2219
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2220	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2221	my $range = ($hi - $page - $lo) || 1e-100;
2057		2222
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2223	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059		2224
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2225	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2226	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062		2227
2063	$x -= $inner_pad_px; # substract the padding	2228	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2229	$value = $value * $self->{scale} + $self->{offset};
2065	$x = $lo if $x < $lo;
2066	$x = $hi - $page if $x > $hi - $page;
2067	$self->{range}[0] = $x;
2068		2230
2069	$self->emit (changed => $x);	2231	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	2232	$self->{knob_w} = $knob_w;
2071	}	2233	});
2072	}
2073		2234
2074	# the inner_* stuff is for generating a padding for the slider handle,	2235	$self->SUPER::update;
2075	# so that the handle doesn't leave the texture. This calculation isn't 100%
2076	# correct propably, but it does the job for now
2077	sub _calc_inner_pad_px {
2078	my ($self, $w) = @_;
2079	($w / 100) * $self->{inner_pad} # % to pixels
2080	}	2236	}
2081		2237
2082	sub _draw {	2238	sub _draw {
2083	my ($self) = @_;	2239	my ($self) = @_;
2084		2240
2085	$self->SUPER::_draw ();	2241	$self->SUPER::_draw ();
2086		2242
2087	my ($w, $h) = @$self{qw(w h)};	2243	glScale $self->{w}, $self->{h};
2088		2244
2089	if ($self->{vertical}) {	2245	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2246	# draw a vertical slider like a rotated horizontal slider
2091		2247
		2248	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2249	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2250	}
2097		2251
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2252	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2253	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2254
2101	my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103	$hi = $value + 1 if $lo == $hi;
2104
2105	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108	$page = int $page * $inner_w / ($hi - $lo);
2109	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111	$w -= $page;
2112	$page &= ~1;
2113	glTranslate $page * 0.5, 0, 0;
2114	$page ||= 2;
2115
2116	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119	glEnable GL_TEXTURE_2D;	2255	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2256	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2257
2122	# draw background	2258	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2259	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2260
2125	# draw handle	2261	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2262	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2263
2128	glDisable GL_TEXTURE_2D;	2264	glDisable GL_TEXTURE_2D;
2129	}	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 (@_) }
2130		2307
2131	#############################################################################	2308	#############################################################################
2132		2309
2133	package CFClient::UI::TextView;	2310	package CFClient::UI::TextView;
2134		2311
…		…
2164		2341
2165	$self->{fontsize} = $fontsize;	2342	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2343	$self->reflow;
2167	}	2344	}
2168		2345
2169	sub text_height {
2170	my ($self, $text) = @_;
2171
2172	my $layout = $self->{layout};
2173
2174	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175	$layout->set_width ($self->{children}[0]{w});
2176	$layout->set_markup ($text);
2177
2178	($layout->size)[1]
2179	}
2180
2181	sub reflow {
2182	my ($self) = @_;
2183
2184	$self->{need_reflow}++;
2185	$self->update;
2186	}
2187
2188	sub size_allocate {	2346	sub size_allocate {
2189	my ($self, $w, $h) = @_;	2347	my ($self, $w, $h) = @_;
2190		2348
2191	$self->SUPER::size_allocate ($w, $h);	2349	$self->SUPER::size_allocate ($w, $h);
2192		2350
…		…
2195	$self->{layout}->set_width ($self->{children}[0]{w});	2353	$self->{layout}->set_width ($self->{children}[0]{w});
2196		2354
2197	$self->reflow;	2355	$self->reflow;
2198	}	2356	}
2199		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
2200	sub add_paragraph {	2392	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2393	my ($self, $color, $text, $indent) = @_;
2202		2394
2203	#TODO: intelligently "reformat" paragraph	2395	for my $line (split /\n/, $text) {
2204		2396	my ($w, $h) = $self->text_size ($line);
2205	my $height = $self->text_height ($text);
2206
2207	$self->{height} += $height;	2397	$self->{height} += $h;
		2398	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2399	}
2208		2400
2209	push @{$self->{par}}, [$height, $color, $text];
2210
2211	$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]);
2212	$self->{children}[1]->update;
2213	}	2402	}
2214		2403
2215	sub update {	2404	sub update {
2216	my ($self) = @_;	2405	my ($self) = @_;
2217		2406
…		…
2220	return unless $self->{h} > 0;	2409	return unless $self->{h} > 0;
2221		2410
2222	delete $self->{texture};	2411	delete $self->{texture};
2223		2412
2224	$ROOT->on_post_alloc ($self, sub {	2413	$ROOT->on_post_alloc ($self, sub {
		2414	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2415
2225	if (delete $self->{need_reflow}) {	2416	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2417	my $height = 0;
2227		2418
2228	$height += $_->[0] = $self->text_height ($_->[2])	2419	my $layout = $self->{layout};
		2420
		2421	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2422
2229	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	}
2230		2434
2231	$self->{height} = $height;	2435	$self->{height} = $height;
2232		2436
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2437	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234		2438
2235	delete $self->{texture};	2439	delete $self->{texture};
2236	}	2440	}
2237		2441
2238	$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 {
2239	glClearColor 0, 0, 0, 0;	2443	glClearColor 0.5, 0.5, 0.5, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2444	glClear GL_COLOR_BUFFER_BIT;
2241		2445
2242	glEnable GL_TEXTURE_2D;
2243	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245	my $top = int $self->{children}[1]{range}[0];	2446	my $top = int $self->{children}[1]{range}[0];
2246		2447
2247	my $y0 = $top;	2448	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2449	my $y1 = $top + $H;
2249		2450
2250	my $y = 0;	2451	my $y = 0;
2251		2452
2252	my $layout = $self->{layout};	2453	my $layout = $self->{layout};
2253		2454
2254	$layout->set_font ($self->{font}) if $self->{font};	2455	$layout->set_font ($self->{font}) if $self->{font};
2255		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
2256	for my $par (@{$self->{par}}) {	2461	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2462	my $h = $par->[1];
2258		2463
2259	if ($y0 < $y + $h && $y < $y1) {	2464	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2465	$layout->set_foreground (@{ $par->[2] });
		2466	$layout->set_width ($W - $par->[3]);
2261	$layout->set_markup ($par->[2]);	2467	$layout->set_markup ($par->[4]);
2262		2468
2263	my ($W, $H) = $layout->size;	2469	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	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;
2265	}	2473	}
2266		2474
2267	$y += $h;	2475	$y += $h;
2268	}	2476	}
2269		2477
2270	glDisable GL_TEXTURE_2D;	2478	glDisable GL_BLEND;
2271	};	2479	};
2272	});	2480	});
2273	}	2481	}
2274		2482
2275	sub _draw {	2483	sub _draw {
2276	my ($self) = @_;	2484	my ($self) = @_;
2277		2485
2278	glEnable GL_TEXTURE_2D;	2486	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2487	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2488	glColor 1, 1, 1, 1;
2281	$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});
2282	glDisable GL_TEXTURE_2D;	2490	glDisable GL_TEXTURE_2D;
2283		2491
2284	$self->{children}[1]->draw;	2492	$self->{children}[1]->draw;
2285		2493
2286	}	2494	}
…		…
2355		2563
2356	# TODO: use animation	2564	# TODO: use animation
2357	if ($self->{state} = !$self->{state}) {	2565	if ($self->{state} = !$self->{state}) {
2358	$CFClient::UI::ROOT->add ($self->{other});	2566	$CFClient::UI::ROOT->add ($self->{other});
2359	$self->{other}->move ($self->coord2global (0, $self->{h}));	2567	$self->{other}->move ($self->coord2global (0, $self->{h}));
2360	$self->emit ("open");	2568	$self->_emit ("open");
2361	} else {	2569	} else {
2362	$CFClient::UI::ROOT->remove ($self->{other});	2570	$CFClient::UI::ROOT->remove ($self->{other});
2363	$self->emit ("close");	2571	$self->_emit ("close");
2364	}	2572	}
2365		2573
2366	$self->emit (changed => $self->{state});	2574	$self->_emit (changed => $self->{state});
2367	}	2575	}
2368		2576
2369	#############################################################################	2577	#############################################################################
2370		2578
2371	package CFClient::UI::Tooltip;	2579	package CFClient::UI::Tooltip;
…		…
2385		2593
2386	sub set_tooltip_from {	2594	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2595	my ($self, $widget) = @_;
2388		2596
2389	$self->add (new CFClient::UI::Label	2597	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2598	markup => $widget->{tooltip},
2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2600	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2601	fg => [0, 0, 0, 1],
		2602	ellipsise => 0,
2394	font => ($widget->{tooltip_font} || $::FONT_PROP),	2603	font => ($widget->{tooltip_font} || $::FONT_PROP),
2395	);	2604	);
2396	}	2605	}
2397		2606
2398	sub size_request {	2607	sub size_request {
2399	my ($self) = @_;	2608	my ($self) = @_;
…		…
2445	use CFClient::OpenGL;	2654	use CFClient::OpenGL;
2446		2655
2447	sub new {	2656	sub new {
2448	my $class = shift;	2657	my $class = shift;
2449		2658
2450	$class->SUPER::new (	2659	my $self = $class->SUPER::new (
2451	aspect => 1,	2660	aspect => 1,
		2661	can_events => 0,
2452	@_,	2662	@_,
2453	)	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
2454	}	2680	}
2455		2681
2456	sub size_request {	2682	sub size_request {
2457	(32, 8)	2683	(32, 8)
2458	}	2684	}
2459		2685
		2686	sub update {
		2687	my ($self) = @_;
		2688
		2689	return unless $self->{visible};
		2690
		2691	$self->SUPER::update;
		2692	}
		2693
2460	sub _draw {	2694	sub _draw {
2461	my ($self) = @_;	2695	my ($self) = @_;
2462		2696
2463	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
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2708	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465		2709
2466	# TODO animation
2467	if ($tex) {	2710	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2711	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2713	glColor 1, 1, 1, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2714	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2715	glDisable GL_TEXTURE_2D;
2473	}	2716	}
2474	}	2717	}
2475		2718
		2719	sub DESTROY {
		2720	my ($self) = @_;
		2721
		2722	$self->{timer}->cancel
		2723	if $self->{timer};
		2724
		2725	$self->SUPER::DESTROY;
		2726	}
		2727
2476	#############################################################################	2728	#############################################################################
2477		2729
2478	package CFClient::UI::InventoryItem;	2730	package CFClient::UI::Inventory;
2479		2731
2480	our @ISA = CFClient::UI::HBox::;	2732	our @ISA = CFClient::UI::ScrolledWindow::;
2481		2733
2482	sub new {	2734	sub new {
2483	my $class = shift;	2735	my $class = shift;
2484		2736
2485	my %args = @_;
2486
2487	my $item = delete $args{item};
2488
2489	my $desc = $item->{nrof} < 2
2490	? $item->{name}
2491	: "$item->{nrof} $item->{name_pl}";
2492
2493
2494	my $self = $class->SUPER::new (	2737	my $self = $class->SUPER::new (
2495	can_hover => 1,	2738	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2496	can_events => 1,
2497	tooltip => (CFClient::UI::Label->escape ($desc)
2498	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499	connect_button_down => sub {
2500	my ($self, $ev, $x, $y) = @_;
2501
2502	# todo: maybe put examine on 1? but should just be a tooltip :(
2503	if ($ev->{button} == 1) {
2504	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505	} elsif ($ev->{button} == 2) {
2506	$::CONN->send ("apply $item->{tag}");
2507	} elsif ($ev->{button} == 3) {
2508	CFClient::UI::Menu->new (
2509	items => [
2510	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511	[
2512	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513	sub { $::CONN->send ("lock $item->{tag}") },
2514	],
2515	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518	],
2519	)->popup ($ev);
2520	}
2521
2522	1
2523	},
2524	%args
2525	);
2526
2527	$self->add (new CFClient::UI::Face
2528	can_events => 0,
2529	face => $item->{face},
2530	anim => $item->{anim},
2531	animspeed => $item->{animspeed},
2532	);
2533
2534	$self->add (new CFClient::UI::Label
2535	can_events => 0,
2536	text => $desc,
2537	);
2538
2539	$self
2540	}
2541
2542	#############################################################################
2543
2544	package CFClient::UI::Inventory;
2545
2546	our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548	sub new {
2549	my $class = shift;
2550
2551	my $self = $class->SUPER::new (
2552	scrolled => (new CFClient::UI::VBox),
2553	@_,	2739	@_,
2554	);	2740	);
2555		2741
2556	$self	2742	$self
2557	}	2743	}
…		…
2567	or ($a->{name} cmp $b->{name})	2753	or ($a->{name} cmp $b->{name})
2568	} @$items;	2754	} @$items;
2569		2755
2570	$self->{real_items} = \@items;	2756	$self->{real_items} = \@items;
2571		2757
		2758	my $row = 0;
2572	for my $item (@items) {	2759	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2	2760	CFClient::Item::update_widgets $item;
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576		2761
2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2762	$self->{scrolled}->add (0, $row, $item->{face_widget});
2578	}	2763	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2764	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2579		2765
2580	$self->{scrolled}->add (@items);	2766	$row++;
2581		2767	}
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}	2768	}
2584		2769
2585	sub size_request {	2770	sub size_request {
2586	my ($self) = @_;	2771	my ($self) = @_;
2587	($self->{req_w}, $self->{req_h});	2772	($self->{req_w}, $self->{req_h});
…		…
2627		2812
2628	# 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)
2629	sub popup {	2814	sub popup {
2630	my ($self, $ev) = @_;	2815	my ($self, $ev) = @_;
2631		2816
2632	$self->emit ("popdown");	2817	$self->_emit ("popdown");
2633		2818
2634	# maybe save $GRAB? must be careful about events...	2819	# maybe save $GRAB? must be careful about events...
2635	$GRAB = $self;	2820	$GRAB = $self;
2636	$self->{button} = $ev->{button};	2821	$self->{button} = $ev->{button};
2637		2822
…		…
2652		2837
2653	if ($ev->{button} == $self->{button}) {	2838	if ($ev->{button} == $self->{button}) {
2654	undef $GRAB;	2839	undef $GRAB;
2655	$self->hide;	2840	$self->hide;
2656		2841
2657	$self->emit ("popdown");	2842	$self->_emit ("popdown");
2658	$self->{hover}[1]->() if $self->{hover};	2843	$self->{hover}[1]->() if $self->{hover};
2659	}	2844	}
2660	}	2845	}
2661		2846
2662	#############################################################################	2847	#############################################################################
2663		2848
2664	package CFClient::UI::Statusbox;	2849	package CFClient::UI::Statusbox;
2665		2850
2666	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	}
2667		2861
2668	sub reorder {	2862	sub reorder {
2669	my ($self) = @_;	2863	my ($self) = @_;
2670	my $NOW = time;	2864	my $NOW = time;
2671		2865
…		…
2690	? "<b>$item->{count} ×</b> $item->{text}"	2884	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	2885	: $item->{text};
2692		2886
2693	for ($short) {	2887	for ($short) {
2694	s/^\s+//;	2888	s/^\s+//;
2695	s/\012.*/…/s;	2889	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	2890	}
2699		2891
2700	new CFClient::UI::Label	2892	new CFClient::UI::Label
2701	markup => $short,	2893	markup => $short,
2702	tooltip => $item->{tooltip},	2894	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	2895	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	2896	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	2897	fontsize => $item->{fontsize} || $self->{fontsize},
		2898	max_w => $::WIDTH * 0.44,
2706	color => $item->{color},	2899	fg => $item->{fg},
2707	can_events => 1,	2900	can_events => 1,
2708	can_hover => 1	2901	can_hover => 1
2709	};	2902	};
2710	}	2903	}
2711		2904
…		…
2716	sub add {	2909	sub add {
2717	my ($self, $text, %arg) = @_;	2910	my ($self, $text, %arg) = @_;
2718		2911
2719	$text =~ s/^\s+//;	2912	$text =~ s/^\s+//;
2720	$text =~ s/\s+$//;	2913	$text =~ s/\s+$//;
		2914
		2915	return unless $text;
2721		2916
2722	my $timeout = time + ((delete $arg{timeout}) || 60);	2917	my $timeout = time + ((delete $arg{timeout}) || 60);
2723		2918
2724	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2919	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725		2920
…		…
2737	$self->{item}{$group} = {	2932	$self->{item}{$group} = {
2738	id => ++$self->{id},	2933	id => ++$self->{id},
2739	text => $text,	2934	text => $text,
2740	timeout => $timeout,	2935	timeout => $timeout,
2741	tooltip => $text,	2936	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	2937	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	2938	pri => 0,
2745	count => 1,	2939	count => 1,
2746	%arg,	2940	%arg,
2747	};	2941	};
2748	}	2942	}
2749		2943
2750	$self->reorder;	2944	$self->reorder;
2751	}	2945	}
2752		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
2753	#############################################################################	2957	#############################################################################
2754		2958
2755	package CFClient::UI::Root;	2959	package CFClient::UI::Root;
2756		2960
2757	our @ISA = CFClient::UI::Container::;	2961	our @ISA = CFClient::UI::Container::;
…		…
2787	}	2991	}
2788		2992
2789	sub size_allocate {	2993	sub size_allocate {
2790	my ($self, $w, $h) = @_;	2994	my ($self, $w, $h) = @_;
2791		2995
2792	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798	for my $child ($self->children) {	2996	for my $child ($self->children) {
2799	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)};
2800		2998
		2999	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3000	if exists $child->{req_x};
		3001
		3002	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3003	if exists $child->{req_y};
		3004
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2802	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3007
2803	$child->configure ($X, $Y, $W, $H);	3008	$child->configure ($X, $Y, $W, $H);
2804	}	3009	}
2805	}	3010	}
2806		3011
2807	sub coord2local {	3012	sub coord2local {
…		…
2824	}	3029	}
2825		3030
2826	sub add {	3031	sub add {
2827	my ($self, @children) = @_;	3032	my ($self, @children) = @_;
2828		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
2829	for my $child (@children) {	3040	for my $child (@children) {
2830	$child->{toplevel} = 1;	3041	$child->{is_toplevel} = 1;
2831		3042
2832	# integerise window positions	3043	# integerise window positions
2833	$child->{x} = int $child->{x};	3044	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};	3045	$child->{y} = int $child->{y};
2835	}	3046	}
2836		3047
2837	$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	}
2838	}	3061	}
2839		3062
2840	sub on_refresh {	3063	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2842		3065
…		…
2895	$w = 0 if $w < 0;	3118	$w = 0 if $w < 0;
2896	$h = 0 if $h < 0;	3119	$h = 0 if $h < 0;
2897		3120
2898	$widget->{w} = $w;	3121	$widget->{w} = $w;
2899	$widget->{h} = $h;	3122	$widget->{h} = $h;
2900	$widget->size_allocate ($w, $h);
2901	$widget->emit (size_allocate => $w, $h);	3123	$widget->emit (size_allocate => $w, $h);
2902	}	3124	}
2903	}	3125	}
2904		3126
2905	while ($self->{post_alloc_hook}) {	3127	while ($self->{post_alloc_hook}) {
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3133	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3134	glClear GL_COLOR_BUFFER_BIT;
2913		3135
2914	glMatrixMode GL_PROJECTION;	3136	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3137	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3138	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3139	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3140	glLoadIdentity;
2919		3141
2920	$self->_draw;	3142	$self->_draw;
2921	}	3143	}
…		…
2923	#############################################################################	3145	#############################################################################
2924		3146
2925	package CFClient::UI;	3147	package CFClient::UI;
2926		3148
2927	$ROOT = new CFClient::UI::Root;	3149	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3150	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3151
2930	1	3152	1
2931		3153

Diff Legend

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