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.232 by root, Thu May 25 02:23:14 2006 UTC

…		…
31	$TOOLTIP->set_tooltip_from ($widget);	31	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	32	$TOOLTIP->show;
33		33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		35
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
39		38
40	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;	40	$TOOLTIP->check_size;
42	$TOOLTIP->update;	41	$TOOLTIP->update;
43	}	42	}
…		…
51	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
52	}	51	}
53		52
54	# class methods for events	53	# class methods for events
55	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
57	if $FOCUS;	56	if $FOCUS;
58	}	57	}
59		58
60	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
62	if $FOCUS;	61	if $FOCUS;
63	}	62	}
64		63
65	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
66	my ($ev) = @_;	65	my ($ev) = @_;
…		…
75	check_tooltip;	74	check_tooltip;
76	}	75	}
77		76
78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
79		78
80	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83	}
84	}	81	}
85		82
86	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
87	my ($ev) = @_;	84	my ($ev) = @_;
88	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
89		86
90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91		88
92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93		90
94	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97	}
98		93
99	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
100	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
101	$grab->update if $grab;	96	$grab->update if $grab;
102	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
118	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
119		114
120	check_tooltip;	115	check_tooltip;
121	}	116	}
122		117
123	if ($HOVER) {
124	($x, $y) = $HOVER->coord2local ($x, $y);
125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126	}	119	if $HOVER;
127	}	120	}
128		121
129	# convert position array to integers	122	# convert position array to integers
130	sub harmonize {	123	sub harmonize {
131	my ($vals) = @_;	124	my ($vals) = @_;
…		…
137	$rem += $_ - $i;	130	$rem += $_ - $i;
138	$_ = $i;	131	$_ = $i;
139	}	132	}
140	}	133	}
141		134
		135	sub full_refresh {
		136	# make a copy, otherwise for complains about freed values.
		137	my @widgets = values %WIDGET;
		138
		139	$_->update
		140	for @widgets;
		141	}
		142
		143	sub reconfigure_widgets {
		144	# make a copy, otherwise C<for> complains about freed values.
		145	my @widgets = values %WIDGET;
		146
		147	$_->reconfigure
		148	for @widgets;
		149	}
		150
142	# call when resolution changes etc.	151	# call when resolution changes etc.
143	sub rescale_widgets {	152	sub rescale_widgets {
144	my ($sx, $sy) = @_;	153	my ($sx, $sy) = @_;
145		154
146	for my $widget (values %WIDGET) {	155	for my $widget (values %WIDGET) {
147	if ($widget->{toplevel}) {	156	if ($widget->{is_toplevel}) {
148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	157	$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};	158	$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};	159	$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};	160	$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};	161	$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};	162	$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};	163	$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};	164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156	}	165	}
157
158	$widget->reconfigure;
159	}	166	}
		167
		168	reconfigure_widgets;
160	}	169	}
161		170
162	#############################################################################	171	#############################################################################
163		172
164	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
196	%$self = ();	205	%$self = ();
197	}	206	}
198		207
199	sub show {	208	sub show {
200	my ($self) = @_;	209	my ($self) = @_;
201
202	return if $self->{parent};	210	return if $self->{parent};
203		211
204	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
205	}	213	}
206		214
207	sub hide {	215	sub show_centered {
208	my ($self) = @_;	216	my ($self) = @_;
		217	return if $self->{parent};
		218
		219	$self->show;
		220
		221	$CFClient::UI::ROOT->on_post_alloc (
		222	"centered $self" => sub {
		223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		224	},
		225	);
		226	}
		227
		228	sub set_invisible {
		229	my ($self) = @_;
		230
		231	# broken show/hide model
		232
		233	delete $self->{visible};
209		234
210	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
211	undef $HOVER if $HOVER == $self;	236	undef $HOVER if $HOVER == $self;
		237
		238	CFClient::UI::check_tooltip
		239	if $CFClient::UI::TOOLTIP->{owner} == $self;
		240
		241	$self->focus_out;
		242	}
		243
		244	sub hide {
		245	my ($self) = @_;
		246
		247	$self->set_invisible;
212		248
213	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
214	if $self->{parent};	250	if $self->{parent};
215	}	251	}
216		252
…		…
283		319
284	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
285	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
286	}	322	}
287		323
		324	sub set_tooltip {
		325	my ($self, $tooltip) = @_;
		326
		327	$self->{tooltip} = $tooltip;
		328
		329	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		330	delete $CFClient::UI::TOOLTIP->{owner};
		331	CFClient::UI::check_tooltip;
		332	}
		333	}
		334
288	# translate global coordinates to local coordinate system	335	# translate global coordinates to local coordinate system
289	sub coord2local {	336	sub coord2local {
290	my ($self, $x, $y) = @_;	337	my ($self, $x, $y) = @_;
291		338
292	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	339	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
305	return if $FOCUS == $self;	352	return if $FOCUS == $self;
306	return unless $self->{can_focus};	353	return unless $self->{can_focus};
307		354
308	my $focus = $FOCUS; $FOCUS = $self;	355	my $focus = $FOCUS; $FOCUS = $self;
309		356
310	$self->emit (focus_in => $focus);	357	$self->_emit (focus_in => $focus);
311		358
312	$focus->update if $focus;	359	$focus->update if $focus;
313	$FOCUS->update;	360	$FOCUS->update;
314	}	361	}
315		362
…		…
318		365
319	return unless $FOCUS == $self;	366	return unless $FOCUS == $self;
320		367
321	my $focus = $FOCUS; undef $FOCUS;	368	my $focus = $FOCUS; undef $FOCUS;
322		369
323	$self->emit (focus_out => $focus);	370	$self->_emit (focus_out => $focus);
324		371
325	$focus->update if $focus; #?	372	$focus->update if $focus; #?
		373
		374	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		375	unless $FOCUS;
326	}	376	}
327		377
328	sub mouse_motion { }	378	sub mouse_motion { }
329	sub button_up { }	379	sub button_up { }
330	sub key_down { }	380	sub key_down { }
331	sub key_up { }	381	sub key_up { }
332		382
333	sub button_down {	383	sub button_down {
334	my ($self, $ev, $x, $y) = @_;	384	my ($self, $ev, $x, $y) = @_;
335		385
336	$self->focus_in;	386	$self->focus_in;
…		…
376	glVertex $self->{w}, 0;	426	glVertex $self->{w}, 0;
377	glVertex $self->{w}, $self->{h};	427	glVertex $self->{w}, $self->{h};
378	glVertex 0 , $self->{h};	428	glVertex 0 , $self->{h};
379	glEnd;	429	glEnd;
380	glPopMatrix;	430	glPopMatrix;
381	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	431	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382	}	432	}
383	}	433	}
384		434
385	sub _draw {	435	sub _draw {
386	my ($self) = @_;	436	my ($self) = @_;
…		…
406	Scalar::Util::weaken ($self->{parent} = $parent);	456	Scalar::Util::weaken ($self->{parent} = $parent);
407		457
408	# TODO: req_w _does_change after ->reconfigure	458	# TODO: req_w _does_change after ->reconfigure
409	$self->check_size	459	$self->check_size
410	unless exists $self->{req_w};	460	unless exists $self->{req_w};
		461
		462	$self->show;
411	}	463	}
412		464
413	sub check_size {	465	sub check_size {
414	my ($self, $forced) = @_;	466	my ($self, $forced) = @_;
415		467
…		…
428	my ($self, $signal, $cb) = @_;	480	my ($self, $signal, $cb) = @_;
429		481
430	push @{ $self->{signal_cb}{$signal} }, $cb;	482	push @{ $self->{signal_cb}{$signal} }, $cb;
431	}	483	}
432		484
		485	sub _emit {
		486	my ($self, $signal, @args) = @_;
		487
		488	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		489	}
		490
433	sub emit {	491	sub emit {
434	my ($self, $signal, @args) = @_;	492	my ($self, $signal, @args) = @_;
435		493
436	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	494	$self->_emit ($signal, @args)
		495	|| $self->$signal (@args);
437	}	496	}
438		497
439	sub DESTROY {	498	sub DESTROY {
440	my ($self) = @_;	499	my ($self) = @_;
441		500
…		…
456	my $class = shift;	515	my $class = shift;
457		516
458	# range [value, low, high, page]	517	# range [value, low, high, page]
459		518
460	$class->SUPER::new (	519	$class->SUPER::new (
461	bg => [0, 0, 0, 0.2],	520	#bg => [0, 0, 0, 0.2],
462	active_bg => [1, 1, 1, 0.5],	521	#active_bg => [1, 1, 1, 0.5],
463	@_	522	@_
464	)	523	)
465	}	524	}
466		525
467	sub _draw {	526	sub _draw {
468	my ($self) = @_;	527	my ($self) = @_;
469		528
		529	my $color = $FOCUS == $self && $self->{active_bg}
		530	? $self->{active_bg}
		531	: $self->{bg};
		532
		533	if ($color && (@$color < 4 || $color->[3])) {
470	my ($w, $h) = @$self{qw(w h)};	534	my ($w, $h) = @$self{qw(w h)};
471		535
472	glEnable GL_BLEND;	536	glEnable GL_BLEND;
473	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	537	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	538	glColor @$color;
475		539
476	glBegin GL_QUADS;	540	glBegin GL_QUADS;
477	glVertex 0 , 0;	541	glVertex 0 , 0;
478	glVertex 0 , $h;	542	glVertex 0 , $h;
479	glVertex $w, $h;	543	glVertex $w, $h;
480	glVertex $w, 0;	544	glVertex $w, 0;
481	glEnd;	545	glEnd;
482		546
483	glDisable GL_BLEND;	547	glDisable GL_BLEND;
		548	}
484	}	549	}
485		550
486	#############################################################################	551	#############################################################################
487		552
488	package CFClient::UI::Empty;	553	package CFClient::UI::Empty;
…		…
672	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	737	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673	glClearColor 0, 0, 0, 0;	738	glClearColor 0, 0, 0, 0;
674	glClear GL_COLOR_BUFFER_BIT;	739	glClear GL_COLOR_BUFFER_BIT;
675		740
676	$self->_render;	741	$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	};	742	};
685	}	743	}
686		744
687	sub _draw {	745	sub _draw {
688	my ($self) = @_;	746	my ($self) = @_;
…		…
692	my $tex = $self->{texture}	750	my $tex = $self->{texture}
693	or return;	751	or return;
694		752
695	glEnable GL_TEXTURE_2D;	753	glEnable GL_TEXTURE_2D;
696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	754	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697	glColor 0, 0, 0, 1;	755	glColor 1, 1, 1, 1;
698		756
699	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	757	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700		758
701	glDisable GL_TEXTURE_2D;	759	glDisable GL_TEXTURE_2D;
702	}	760	}
…		…
709		767
710	sub size_request {	768	sub size_request {
711	my ($self) = @_;	769	my ($self) = @_;
712		770
713	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	771	@$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		772
716	@$self{qw(child_w child_h)}	773	@$self{qw(child_w child_h)}
717	}	774	}
718		775
719	sub size_allocate {	776	sub size_allocate {
720	my ($self, $w, $h) = @_;	777	my ($self, $w, $h) = @_;
721		778
		779	my ($cw, $ch) = @$self{qw(child_w child_h)};
		780	# $w = $self->{w};
		781	$self->child->configure (0, 0, $cw, $ch);
722	$self->update;	782	$self->update;
723	}	783	}
724		784
725	sub set_offset {	785	sub set_offset {
726	my ($self, $x, $y) = @_;	786	my ($self, $x, $y) = @_;
…		…
780		840
781	my $slider = new CFClient::UI::Slider	841	my $slider = new CFClient::UI::Slider
782	vertical => 1,	842	vertical => 1,
783	range => [0, 0, 1, 0.01], # HACK fix	843	range => [0, 0, 1, 0.01], # HACK fix
784	connect_changed => sub {	844	connect_changed => sub {
785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	845	$self->{vp}->set_offset (0, $_[1]);
786	},	846	},
787	;	847	;
788		848
789	$self = $class->SUPER::new (	849	$self = $class->SUPER::new (
790	vp => (new CFClient::UI::ViewPort),	850	vp => (new CFClient::UI::ViewPort expand => 1),
791	slider => $slider,	851	slider => $slider,
792	@_,	852	@_,
793	);	853	);
794		854
795	$self->{vp}->add ($self->{scrolled});	855	$self->{vp}->add ($self->{scrolled});
796	$self->add ($self->{vp});	856	$self->add ($self->{vp});
797	$self->add ($self->{slider});	857	$self->add ($self->{slider});
798		858
799	$self	859	$self
		860	}
		861
		862	sub size_allocate {
		863	my ($self, $w, $h) = @_;
		864
		865	$self->SUPER::size_allocate ($w, $h);
		866
		867	my $child = $self->{vp}->child;
		868	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800	}	869	}
801		870
802	#TODO# update range on size_allocate depending on child	871	#TODO# update range on size_allocate depending on child
803	# update viewport offset on scroll	872	# update viewport offset on scroll
804		873
…		…
858	my $class = shift;	927	my $class = shift;
859		928
860	# TODO: user_x, user_y, overwrite moveto?	929	# TODO: user_x, user_y, overwrite moveto?
861		930
862	my $self = $class->SUPER::new (	931	my $self = $class->SUPER::new (
863	bg => [1, 1, 1, 1],	932	bg => [1, 1, 1, 1],
864	border_bg => [1, 1, 1, 1],	933	border_bg => [1, 1, 1, 1],
865	border => 0.6,	934	border => 0.6,
866	toplevel => 1,	935	is_toplevel => 1,
867	can_events => 1,	936	can_events => 1,
868	@_	937	@_
869	);	938	);
870		939
871	$self->{title} &&= new CFClient::UI::Label	940	$self->{title} &&= new CFClient::UI::Label
872	align => 0,	941	align => 0,
…		…
896	my ($self, $w, $h) = @_;	965	my ($self, $w, $h) = @_;
897		966
898	$h -= List::Util::max 0, $self->border * 2;	967	$h -= List::Util::max 0, $self->border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	968	$w -= List::Util::max 0, $self->border * 2;
900		969
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	970	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902	if $self->{title};	971	if $self->{title};
903		972
904	$self->child->configure ($self->border, $self->border, $w, $h);	973	$self->child->configure ($self->border, $self->border, $w, $h);
905	}	974	}
906		975
…		…
1267		1336
1268	#############################################################################	1337	#############################################################################
1269		1338
1270	package CFClient::UI::Label;	1339	package CFClient::UI::Label;
1271		1340
1272	our @ISA = CFClient::UI::Base::;	1341	our @ISA = CFClient::UI::DrawBG::;
1273		1342
1274	use CFClient::OpenGL;	1343	use CFClient::OpenGL;
1275		1344
1276	sub new {	1345	sub new {
1277	my ($class, %arg) = @_;	1346	my ($class, %arg) = @_;
1278		1347
1279	my $self = $class->SUPER::new (	1348	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1349	fg => [1, 1, 1],
		1350	#bg => none
		1351	#active_bg => none
1281	#font => default_font	1352	#font => default_font
1282	#text => initial text	1353	#text => initial text
1283	#markup => initial narkup	1354	#markup => initial narkup
		1355	#max_w => maximum pixel width
		1356	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1357	layout => (new CFClient::Layout),
1285	fontsize => 1,	1358	fontsize => 1,
1286	align => -1,	1359	align => -1,
1287	valign => -1,	1360	valign => -1,
1288	padding => 2,	1361	padding => 2,
…		…
1303	}	1376	}
1304		1377
1305	$self	1378	$self
1306	}	1379	}
1307		1380
1308	sub escape {	1381	sub escape($) {
1309	local $_ = $_[1];	1382	local $_ = $_[0];
1310		1383
1311	s/&/&amp;/g;	1384	s/&/&amp;/g;
1312	s/>/&gt;/g;	1385	s/>/&gt;/g;
1313	s/</&lt;/g;	1386	s/</&lt;/g;
1314		1387
1315	$_[1]	1388	$_
1316	}	1389	}
1317		1390
1318	sub update {	1391	sub update {
1319	my ($self) = @_;	1392	my ($self) = @_;
1320		1393
…		…
1353	sub size_request {	1426	sub size_request {
1354	my ($self) = @_;	1427	my ($self) = @_;
1355		1428
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1429	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} || -1);	1430	$self->{layout}->set_width ($self->{max_w} || -1);
		1431	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1432	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1433	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1434
1360	my ($w, $h) = $self->{layout}->size;	1435	my ($w, $h) = $self->{layout}->size;
1361		1436
1362	if (exists $self->{template}) {	1437	if (exists $self->{template}) {
…		…
1392	}	1467	}
1393		1468
1394	sub _draw {	1469	sub _draw {
1395	my ($self) = @_;	1470	my ($self) = @_;
1396		1471
		1472	$self->SUPER::_draw; # draw background, if applicable
		1473
1397	my $tex = $self->{texture} ||= do {	1474	my $tex = $self->{texture} ||= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1475	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1476	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	1477	$self->{layout}->set_width ($self->{w});
		1478	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1479	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1480	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1481
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1482	my $tex = new_from_layout CFClient::Texture $self->{layout};
1404		1483
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1484	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1485	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1486	: ($self->{w} - $tex->{w}) * 0.5);
1408		1487
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1488	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1489	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1490	: ($self->{h} - $tex->{h}) * 0.5);
1412		1491
1413	$tex	1492	$tex
1414	};	1493	};
1415		1494
1416	glEnable GL_TEXTURE_2D;	1495	glEnable GL_TEXTURE_2D;
…		…
1444	active_fg => [0, 0, 0],	1523	active_fg => [0, 0, 0],
1445	can_hover => 1,	1524	can_hover => 1,
1446	can_focus => 1,	1525	can_focus => 1,
1447	valign => 0,	1526	valign => 0,
1448	can_events => 1,	1527	can_events => 1,
		1528	#text => ...
1449	@_	1529	@_
1450	)	1530	)
1451	}	1531	}
1452		1532
1453	sub _set_text {	1533	sub _set_text {
…		…
1463	$self->{text} = $text;	1543	$self->{text} = $text;
1464		1544
1465	$text =~ s/./*/g if $self->{hidden};	1545	$text =~ s/./*/g if $self->{hidden};
1466	$self->{layout}->set_text ("$text ");	1546	$self->{layout}->set_text ("$text ");
1467		1547
1468	$self->emit (changed => $self->{text});	1548	$self->_emit (changed => $self->{text});
1469	}	1549	}
1470		1550
1471	sub set_text {	1551	sub set_text {
1472	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1473		1553
1474	$self->{cursor} = length $text;	1554	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1555	$self->_set_text ($text);
		1556	$self->update;
1476	$self->check_size;	1557	$self->check_size;
1477	$self->update;
1478	}	1558	}
1479		1559
1480	sub get_text {	1560	sub get_text {
1481	$_[0]{text}	1561	$_[0]{text}
1482	}	1562	}
…		…
1485	my ($self) = @_;	1565	my ($self) = @_;
1486		1566
1487	my ($w, $h) = $self->SUPER::size_request;	1567	my ($w, $h) = $self->SUPER::size_request;
1488		1568
1489	($w + 1, $h) # add 1 for cursor	1569	($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	}	1570	}
1497		1571
1498	sub key_down {	1572	sub key_down {
1499	my ($self, $ev) = @_;	1573	my ($self, $ev) = @_;
1500		1574
…		…
1515	} elsif ($sym == CFClient::SDLK_HOME) {	1589	} elsif ($sym == CFClient::SDLK_HOME) {
1516	$self->{cursor} = 0;	1590	$self->{cursor} = 0;
1517	} elsif ($sym == CFClient::SDLK_END) {	1591	} elsif ($sym == CFClient::SDLK_END) {
1518	$self->{cursor} = length $text;	1592	$self->{cursor} = length $text;
1519	} elsif ($uni == 27) {	1593	} elsif ($uni == 27) {
1520	$self->emit ('escape');	1594	$self->_emit ('escape');
1521	} elsif ($uni) {	1595	} elsif ($uni) {
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1596	substr $text, $self->{cursor}++, 0, chr $uni;
1523	}	1597	}
1524		1598
1525	$self->_set_text ($text);	1599	$self->_set_text ($text);
1526	$self->update;	1600	$self->update;
		1601	$self->check_size;
1527	}	1602	}
1528		1603
1529	sub focus_in {	1604	sub focus_in {
1530	my ($self) = @_;	1605	my ($self) = @_;
1531		1606
…		…
1611	if ($sym == 13) {	1686	if ($sym == 13) {
1612	unshift @{$self->{history}},	1687	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	1688	my $txt = $self->get_text;
1614	$self->{history_pointer} = -1;	1689	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	1690	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	1691	$self->_emit (activate => $txt);
1617	$self->update;	1692	$self->update;
1618		1693
1619	} elsif ($sym == CFClient::SDLK_UP) {	1694	} elsif ($sym == CFClient::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	1695	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	1696	$self->{history_saveback} = $self->get_text;
…		…
1660	my $class = shift;	1735	my $class = shift;
1661		1736
1662	$class->SUPER::new (	1737	$class->SUPER::new (
1663	padding => 4,	1738	padding => 4,
1664	fg => [1, 1, 1],	1739	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1740	active_fg => [0, 0, 1],
1667	can_hover => 1,	1741	can_hover => 1,
1668	align => 0,	1742	align => 0,
1669	valign => 0,	1743	valign => 0,
1670	can_events => 1,	1744	can_events => 1,
1671	@_	1745	@_
1672	)	1746	)
1673	}	1747	}
1674		1748
		1749	sub activate { }
		1750
1675	sub button_up {	1751	sub button_up {
1676	my ($self, $ev, $x, $y) = @_;	1752	my ($self, $ev, $x, $y) = @_;
1677		1753
		1754	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	1755	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	1756	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");
1681	}
1682	}	1757	}
1683		1758
1684	sub _draw {	1759	sub _draw {
1685	my ($self) = @_;	1760	my ($self) = @_;
1686		1761
…		…
1718		1793
1719	$class->SUPER::new (	1794	$class->SUPER::new (
1720	padding => 2,	1795	padding => 2,
1721	fg => [1, 1, 1],	1796	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1797	active_fg => [1, 1, 0],
		1798	bg => [0, 0, 0, 0.2],
		1799	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1800	state => 0,
1724	can_hover => 1,	1801	can_hover => 1,
1725	@_	1802	@_
1726	)	1803	)
1727	}	1804	}
…		…
1736	my ($self, $ev, $x, $y) = @_;	1813	my ($self, $ev, $x, $y) = @_;
1737		1814
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1815	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1816	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740	$self->{state} = !$self->{state};	1817	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});	1818	$self->_emit (changed => $self->{state});
1742	}	1819	}
1743	}	1820	}
1744		1821
1745	sub _draw {	1822	sub _draw {
1746	my ($self) = @_;	1823	my ($self) = @_;
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2088	qw(s1_slider.png s1_slider_bg.png);
2012		2089
2013	sub new {	2090	sub new {
2014	my $class = shift;	2091	my $class = shift;
2015		2092
2016	# range [value, low, high, page]	2093	# range [value, low, high, page, unit]
2017		2094
2018	# TODO: 0-width page	2095	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2096	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2097	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2098	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2099	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2100	active_fg => [0, 0, 0],
		2101	bg => [0, 0, 0, 0.2],
		2102	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2103	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2104	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2105	req_h => $::WIDTH / 80,
2027	vertical => 0,	2106	vertical => 0,
2028	can_hover => 1,	2107	can_hover => 1,
2029	inner_pad => 5,	2108	inner_pad => 0.02,
2030	@_	2109	@_
2031	);	2110	);
2032		2111
		2112	$self->set_value ($self->{range}[0]);
		2113	$self->update;
		2114
2033	$self	2115	$self
		2116	}
		2117
		2118	sub set_range {
		2119	my ($self, $range) = @_;
		2120
		2121	$self->{range} = $range;
		2122
		2123	$self->update;
		2124	}
		2125
		2126	sub set_value {
		2127	my ($self, $value) = @_;
		2128
		2129	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2130
		2131	$hi = $lo + 1 if $hi <= $lo;
		2132
		2133	$page = $hi - $lo if $page > $hi - $lo;
		2134
		2135	$value = $lo if $value < $lo;
		2136	$value = $hi - $page if $value > $hi - $page;
		2137
		2138	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2139	if $unit;
		2140
		2141	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2142
		2143	if ($value != $old_value) {
		2144	$self->_emit (changed => $value);
		2145	$self->update;
		2146	}
2034	}	2147	}
2035		2148
2036	sub size_request {	2149	sub size_request {
2037	my ($self) = @_;	2150	my ($self) = @_;
2038		2151
…		…
2044		2157
2045	sub button_down {	2158	sub button_down {
2046	my ($self, $ev, $x, $y) = @_;	2159	my ($self, $ev, $x, $y) = @_;
2047		2160
2048	$self->SUPER::button_down ($ev, $x, $y);	2161	$self->SUPER::button_down ($ev, $x, $y);
		2162
		2163	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2164
2049	$self->mouse_motion ($ev, $x, $y);	2165	$self->mouse_motion ($ev, $x, $y);
2050	}	2166	}
2051		2167
2052	sub mouse_motion {	2168	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2169	my ($self, $ev, $x, $y) = @_;
2054		2170
2055	if ($GRAB == $self) {	2171	if ($GRAB == $self) {
		2172	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2173
		2174	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2175
		2176	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2177
		2178	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2179	}
		2180	}
		2181
		2182	sub update {
		2183	my ($self) = @_;
		2184
		2185	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2186	$self->set_value ($self->{range}[0]);
		2187
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2188	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2189	my $range = ($hi - $page - $lo) || 1e-100;
2057		2190
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2191	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059		2192
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2193	$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	2194	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062		2195
2063	$x -= $inner_pad_px; # substract the padding	2196	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2197	$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		2198
2069	$self->emit (changed => $x);	2199	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	2200	$self->{knob_w} = $knob_w;
2071	}	2201	});
2072	}
2073		2202
2074	# the inner_* stuff is for generating a padding for the slider handle,	2203	$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	}	2204	}
2081		2205
2082	sub _draw {	2206	sub _draw {
2083	my ($self) = @_;	2207	my ($self) = @_;
2084		2208
2085	$self->SUPER::_draw ();	2209	$self->SUPER::_draw ();
2086		2210
2087	my ($w, $h) = @$self{qw(w h)};	2211	glScale $self->{w}, $self->{h};
2088		2212
2089	if ($self->{vertical}) {	2213	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2214	# draw a vertical slider like a rotated horizontal slider
2091		2215
		2216	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2217	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2218	}
2097		2219
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2220	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2221	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2222
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;	2223	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2225
2122	# draw background	2226	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2227	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2228
2125	# draw handle	2229	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2230	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2231
2128	glDisable GL_TEXTURE_2D;	2232	glDisable GL_TEXTURE_2D;
2129	}	2233	}
		2234
		2235	#############################################################################
		2236
		2237	package CFClient::UI::ValSlider;
		2238
		2239	our @ISA = CFClient::UI::HBox::;
		2240
		2241	sub new {
		2242	my ($class, %arg) = @_;
		2243
		2244	my $range = delete $arg{range};
		2245
		2246	my $self = $class->SUPER::new (
		2247	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2248	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2249	to_value => sub { shift },
		2250	from_value => sub { shift },
		2251	%arg,
		2252	);
		2253
		2254	$self->{slider}->connect (changed => sub {
		2255	my ($self, $value) = @_;
		2256	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2257	$self->{parent}->emit (changed => $value);
		2258	});
		2259
		2260	# $self->{entry}->connect (changed => sub {
		2261	# my ($self, $value) = @_;
		2262	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2263	# $self->{parent}->emit (changed => $value);
		2264	# });
		2265
		2266	$self->add ($self->{slider}, $self->{entry});
		2267
		2268	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2269
		2270	$self
		2271	}
		2272
		2273	sub set_range { shift->{slider}->set_range (@_) }
		2274	sub set_value { shift->{slider}->set_value (@_) }
2130		2275
2131	#############################################################################	2276	#############################################################################
2132		2277
2133	package CFClient::UI::TextView;	2278	package CFClient::UI::TextView;
2134		2279
…		…
2164		2309
2165	$self->{fontsize} = $fontsize;	2310	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2311	$self->reflow;
2167	}	2312	}
2168		2313
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 {	2314	sub size_allocate {
2189	my ($self, $w, $h) = @_;	2315	my ($self, $w, $h) = @_;
2190		2316
2191	$self->SUPER::size_allocate ($w, $h);	2317	$self->SUPER::size_allocate ($w, $h);
2192		2318
…		…
2195	$self->{layout}->set_width ($self->{children}[0]{w});	2321	$self->{layout}->set_width ($self->{children}[0]{w});
2196		2322
2197	$self->reflow;	2323	$self->reflow;
2198	}	2324	}
2199		2325
		2326	sub text_size {
		2327	my ($self, $text, $indent) = @_;
		2328
		2329	my $layout = $self->{layout};
		2330
		2331	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2332	$layout->set_width ($self->{children}[0]{w} - $indent);
		2333	$layout->set_markup ($text);
		2334
		2335	$layout->size
		2336	}
		2337
		2338	sub reflow {
		2339	my ($self) = @_;
		2340
		2341	$self->{need_reflow}++;
		2342	$self->update;
		2343	}
		2344
		2345	sub set_offset {
		2346	my ($self, $offset) = @_;
		2347
		2348	# todo: base offset on lines or so, not on pixels
		2349	$self->{children}[1]->set_value ($offset);
		2350	}
		2351
		2352	sub clear {
		2353	my ($self) = @_;
		2354
		2355	$self->{par} = [];
		2356	$self->{height} = 0;
		2357	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2358	}
		2359
2200	sub add_paragraph {	2360	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2361	my ($self, $color, $text, $indent) = @_;
2202		2362
2203	#TODO: intelligently "reformat" paragraph	2363	for my $line (split /\n/, $text) {
2204		2364	my ($w, $h) = $self->text_size ($line);
2205	my $height = $self->text_height ($text);
2206
2207	$self->{height} += $height;	2365	$self->{height} += $h;
		2366	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2367	}
2208		2368
2209	push @{$self->{par}}, [$height, $color, $text];
2210
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2369	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212	$self->{children}[1]->update;
2213	}	2370	}
2214		2371
2215	sub update {	2372	sub update {
2216	my ($self) = @_;	2373	my ($self) = @_;
2217		2374
…		…
2220	return unless $self->{h} > 0;	2377	return unless $self->{h} > 0;
2221		2378
2222	delete $self->{texture};	2379	delete $self->{texture};
2223		2380
2224	$ROOT->on_post_alloc ($self, sub {	2381	$ROOT->on_post_alloc ($self, sub {
		2382	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2383
2225	if (delete $self->{need_reflow}) {	2384	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2385	my $height = 0;
2227		2386
2228	$height += $_->[0] = $self->text_height ($_->[2])	2387	my $layout = $self->{layout};
		2388
		2389	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2390
2229	for @{$self->{par}};	2391	for (@{$self->{par}}) {
		2392	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2393	$layout->set_width ($W - $_->[3]);
		2394	$layout->set_markup ($_->[4]);
		2395	my ($w, $h) = $layout->size;
		2396	$_->[0] = $w + $_->[3];
		2397	$_->[1] = $h;
		2398	}
		2399
		2400	$height += $_->[1];
		2401	}
2230		2402
2231	$self->{height} = $height;	2403	$self->{height} = $height;
2232		2404
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2405	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234		2406
2235	delete $self->{texture};	2407	delete $self->{texture};
2236	}	2408	}
2237		2409
2238	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2410	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239	glClearColor 0, 0, 0, 0;	2411	glClearColor 0.5, 0.5, 0.5, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2412	glClear GL_COLOR_BUFFER_BIT;
2241		2413
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];	2414	my $top = int $self->{children}[1]{range}[0];
2246		2415
2247	my $y0 = $top;	2416	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2417	my $y1 = $top + $H;
2249		2418
2250	my $y = 0;	2419	my $y = 0;
2251		2420
2252	my $layout = $self->{layout};	2421	my $layout = $self->{layout};
2253		2422
2254	$layout->set_font ($self->{font}) if $self->{font};	2423	$layout->set_font ($self->{font}) if $self->{font};
2255		2424
		2425	glEnable GL_BLEND;
		2426	#TODO# not correct in windows where rgba is forced off
		2427	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2428
2256	for my $par (@{$self->{par}}) {	2429	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2430	my $h = $par->[1];
2258		2431
2259	if ($y0 < $y + $h && $y < $y1) {	2432	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2433	$layout->set_foreground (@{ $par->[2] });
		2434	$layout->set_width ($W - $par->[3]);
2261	$layout->set_markup ($par->[2]);	2435	$layout->set_markup ($par->[4]);
2262		2436
2263	my ($W, $H) = $layout->size;	2437	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2438
		2439	glRasterPos $par->[3], $y - $y0;
		2440	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2441	}
2266		2442
2267	$y += $h;	2443	$y += $h;
2268	}	2444	}
2269		2445
2270	glDisable GL_TEXTURE_2D;	2446	glDisable GL_BLEND;
2271	};	2447	};
2272	});	2448	});
2273	}	2449	}
2274		2450
2275	sub _draw {	2451	sub _draw {
2276	my ($self) = @_;	2452	my ($self) = @_;
2277		2453
2278	glEnable GL_TEXTURE_2D;	2454	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2455	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2456	glColor 1, 1, 1, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2457	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	2458	glDisable GL_TEXTURE_2D;
2283		2459
2284	$self->{children}[1]->draw;	2460	$self->{children}[1]->draw;
2285		2461
2286	}	2462	}
…		…
2355		2531
2356	# TODO: use animation	2532	# TODO: use animation
2357	if ($self->{state} = !$self->{state}) {	2533	if ($self->{state} = !$self->{state}) {
2358	$CFClient::UI::ROOT->add ($self->{other});	2534	$CFClient::UI::ROOT->add ($self->{other});
2359	$self->{other}->move ($self->coord2global (0, $self->{h}));	2535	$self->{other}->move ($self->coord2global (0, $self->{h}));
2360	$self->emit ("open");	2536	$self->_emit ("open");
2361	} else {	2537	} else {
2362	$CFClient::UI::ROOT->remove ($self->{other});	2538	$CFClient::UI::ROOT->remove ($self->{other});
2363	$self->emit ("close");	2539	$self->_emit ("close");
2364	}	2540	}
2365		2541
2366	$self->emit (changed => $self->{state});	2542	$self->_emit (changed => $self->{state});
2367	}	2543	}
2368		2544
2369	#############################################################################	2545	#############################################################################
2370		2546
2371	package CFClient::UI::Tooltip;	2547	package CFClient::UI::Tooltip;
…		…
2385		2561
2386	sub set_tooltip_from {	2562	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2563	my ($self, $widget) = @_;
2388		2564
2389	$self->add (new CFClient::UI::Label	2565	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2566	markup => $widget->{tooltip},
2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2567	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2568	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2569	fg => [0, 0, 0, 1],
		2570	ellipsise => 0,
2394	font => ($widget->{tooltip_font} || $::FONT_PROP),	2571	font => ($widget->{tooltip_font} || $::FONT_PROP),
2395	);	2572	);
2396	}	2573	}
2397		2574
2398	sub size_request {	2575	sub size_request {
2399	my ($self) = @_;	2576	my ($self) = @_;
…		…
2445	use CFClient::OpenGL;	2622	use CFClient::OpenGL;
2446		2623
2447	sub new {	2624	sub new {
2448	my $class = shift;	2625	my $class = shift;
2449		2626
2450	$class->SUPER::new (	2627	my $self = $class->SUPER::new (
2451	aspect => 1,	2628	aspect => 1,
2452	@_,	2629	@_,
2453	)	2630	);
		2631
		2632	if ($self->{anim} && $self->{animspeed}) {
		2633	Scalar::Util::weaken (my $widget = $self);
		2634
		2635	$self->{timer} = Event->timer (
		2636	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2637	hard => 1,
		2638	interval => $self->{animspeed},
		2639	cb => sub {
		2640	++$widget->{frame};
		2641	$widget->update;
		2642	},
		2643	);
		2644	}
		2645
		2646	$self
2454	}	2647	}
2455		2648
2456	sub size_request {	2649	sub size_request {
2457	(32, 8)	2650	(32, 8)
2458	}	2651	}
2459		2652
		2653	sub update {
		2654	my ($self) = @_;
		2655
		2656	return unless $self->{visible};
		2657
		2658	$self->SUPER::update;
		2659	}
		2660
2460	sub _draw {	2661	sub _draw {
2461	my ($self) = @_;	2662	my ($self) = @_;
2462		2663
2463	return unless $::CONN;#d# manage and cache textures differently	2664	return unless $::CONN;
		2665
		2666	my $face;
		2667
		2668	if ($self->{frame}) {
		2669	my $anim = $::CONN->{anim}[$self->{anim}];
		2670
		2671	$face = $anim->[ $self->{frame} % @$anim ]
		2672	if $anim && @$anim;
		2673	}
		2674
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2675	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465		2676
2466	# TODO animation
2467	if ($tex) {	2677	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2678	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2679	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2680	glColor 1, 1, 1, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2681	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2682	glDisable GL_TEXTURE_2D;
2473	}	2683	}
2474	}	2684	}
2475		2685
		2686	sub DESTROY {
		2687	my ($self) = @_;
		2688
		2689	$self->{timer}->cancel
		2690	if $self->{timer};
		2691
		2692	$self->SUPER::DESTROY;
		2693	}
		2694
2476	#############################################################################	2695	#############################################################################
2477		2696
2478	package CFClient::UI::InventoryItem;	2697	package CFClient::UI::InventoryItem;
2479		2698
2480	our @ISA = CFClient::UI::HBox::;	2699	our @ISA = CFClient::UI::HBox::;
		2700
		2701	sub _item_to_desc {
		2702	my ($item) = @_;
		2703
		2704	my $desc =
		2705	$item->{nrof} < 2
		2706	? $item->{name}
		2707	: "$item->{nrof} × $item->{name_pl}";
		2708
		2709	$item->{flags} & Crossfire::Protocol::F_OPEN
		2710	and $desc .= " (open)";
		2711	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2712	and $desc .= " (applied)";
		2713	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2714	and $desc .= " (unpaid)";
		2715	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2716	and $desc .= " (magic)";
		2717	$item->{flags} & Crossfire::Protocol::F_CURSED
		2718	and $desc .= " (cursed)";
		2719	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2720	and $desc .= " (damned)";
		2721	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2722	and $desc .= " *";
		2723
		2724	$desc
		2725	}
2481		2726
2482	sub new {	2727	sub new {
2483	my $class = shift;	2728	my $class = shift;
2484		2729
2485	my %args = @_;	2730	my %args = @_;
2486		2731
2487	my $item = delete $args{item};	2732	my $item = delete $args{item};
2488		2733
2489	my $desc = $item->{nrof} < 2	2734	my $desc = _item_to_desc ($item);
2490	? $item->{name}
2491	: "$item->{nrof} $item->{name_pl}";
2492
2493		2735
2494	my $self = $class->SUPER::new (	2736	my $self = $class->SUPER::new (
2495	can_hover => 1,	2737	can_hover => 1,
2496	can_events => 1,	2738	can_events => 1,
2497	tooltip => (CFClient::UI::Label->escape ($desc)	2739	tooltip => ((CFClient::UI::Label::escape $desc)
2498	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2740	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2499	connect_button_down => sub {	2741	connect_button_down => sub {
2500	my ($self, $ev, $x, $y) = @_;	2742	my ($self, $ev, $x, $y) = @_;
2501		2743
2502	# todo: maybe put examine on 1? but should just be a tooltip :(	2744	# todo: maybe put examine on 1? but should just be a tooltip :(
		2745	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2746	my $targ = $::CONN->{player}{tag};
		2747
		2748	if ($item->{container} == $::CONN->{player}{tag}) {
		2749	$targ = $main::OPENCONT;
		2750	}
		2751
		2752	$::CONN->send ("move $targ $item->{tag} 0");
2503	if ($ev->{button} == 1) {	2753	} elsif ($ev->{button} == 1) {
2504	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2754	$::CONN->send ("examine $item->{tag}");
2505	} elsif ($ev->{button} == 2) {	2755	} elsif ($ev->{button} == 2) {
2506	$::CONN->send ("apply $item->{tag}");	2756	$::CONN->send ("apply $item->{tag}");
2507	} elsif ($ev->{button} == 3) {	2757	} elsif ($ev->{button} == 3) {
2508	CFClient::UI::Menu->new (	2758	my @menu_items = (
2509	items => [
2510	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2759	["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}") }],	2760	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2516	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2761	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2762	(
		2763	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2764	? (
		2765	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2766	)
		2767	: (
		2768	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2517	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2769	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2770	)
2518	],	2771	),
2519	)->popup ($ev);	2772	);
		2773
		2774	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2520	}	2775	}
2521		2776
2522	1	2777	1
2523	},	2778	},
2524	%args	2779	%args
2525	);	2780	);
		2781
2526		2782
2527	$self->add (new CFClient::UI::Face	2783	$self->add (new CFClient::UI::Face
2528	can_events => 0,	2784	can_events => 0,
2529	face => $item->{face},	2785	face => $item->{face},
2530	anim => $item->{anim},	2786	anim => $item->{anim},
2531	animspeed => $item->{animspeed},	2787	animspeed => $item->{animspeed},
2532	);	2788	);
2533		2789
2534	$self->add (new CFClient::UI::Label	2790	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2535	can_events => 0,	2791
2536	text => $desc,	2792	$self->{item} = $item;
2537	);	2793
		2794	$self->update_item;
2538		2795
2539	$self	2796	$self
		2797	}
		2798
		2799	sub update_item {
		2800	my ($self) = @_;
		2801
		2802	my $desc = _item_to_desc ($self->{item});
		2803
		2804	$self->{name_lbl}->set_text ($desc);
2540	}	2805	}
2541		2806
2542	#############################################################################	2807	#############################################################################
2543		2808
2544	package CFClient::UI::Inventory;	2809	package CFClient::UI::Inventory;
…		…
2547		2812
2548	sub new {	2813	sub new {
2549	my $class = shift;	2814	my $class = shift;
2550		2815
2551	my $self = $class->SUPER::new (	2816	my $self = $class->SUPER::new (
2552	scrolled => (new CFClient::UI::VBox),	2817	scrolled => (new CFClient::UI::Table),
2553	@_,	2818	@_,
2554	);	2819	);
2555		2820
2556	$self	2821	$self
2557	}	2822	}
…		…
2568	} @$items;	2833	} @$items;
2569		2834
2570	$self->{real_items} = \@items;	2835	$self->{real_items} = \@items;
2571		2836
2572	for my $item (@items) {	2837	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2	2838	$item->{item} = $item;
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576
2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2839	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2840	$item->update_item ();
2578	}	2841	}
2579		2842
		2843	my $i = 0;
		2844	for (@items) {
2580	$self->{scrolled}->add (@items);	2845	$self->{scrolled}->add (0, $i, $_);
		2846	my $nrof = $_->{item}->{nrof} || 1;
		2847	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
		2848	}
2581		2849
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2850	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}	2851	}
2584		2852
2585	sub size_request {	2853	sub size_request {
…		…
2627		2895
2628	# popup given the event (must be a mouse button down event currently)	2896	# popup given the event (must be a mouse button down event currently)
2629	sub popup {	2897	sub popup {
2630	my ($self, $ev) = @_;	2898	my ($self, $ev) = @_;
2631		2899
2632	$self->emit ("popdown");	2900	$self->_emit ("popdown");
2633		2901
2634	# maybe save $GRAB? must be careful about events...	2902	# maybe save $GRAB? must be careful about events...
2635	$GRAB = $self;	2903	$GRAB = $self;
2636	$self->{button} = $ev->{button};	2904	$self->{button} = $ev->{button};
2637		2905
…		…
2652		2920
2653	if ($ev->{button} == $self->{button}) {	2921	if ($ev->{button} == $self->{button}) {
2654	undef $GRAB;	2922	undef $GRAB;
2655	$self->hide;	2923	$self->hide;
2656		2924
2657	$self->emit ("popdown");	2925	$self->_emit ("popdown");
2658	$self->{hover}[1]->() if $self->{hover};	2926	$self->{hover}[1]->() if $self->{hover};
2659	}	2927	}
2660	}	2928	}
2661		2929
2662	#############################################################################	2930	#############################################################################
2663		2931
2664	package CFClient::UI::Statusbox;	2932	package CFClient::UI::Statusbox;
2665		2933
2666	our @ISA = CFClient::UI::VBox::;	2934	our @ISA = CFClient::UI::VBox::;
		2935
		2936	sub new {
		2937	my $class = shift;
		2938
		2939	$class->SUPER::new (
		2940	fontsize => 0.8,
		2941	@_,
		2942	)
		2943	}
2667		2944
2668	sub reorder {	2945	sub reorder {
2669	my ($self) = @_;	2946	my ($self) = @_;
2670	my $NOW = time;	2947	my $NOW = time;
2671		2948
…		…
2690	? "<b>$item->{count} ×</b> $item->{text}"	2967	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	2968	: $item->{text};
2692		2969
2693	for ($short) {	2970	for ($short) {
2694	s/^\s+//;	2971	s/^\s+//;
2695	s/\012.*/…/s;	2972	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	2973	}
2699		2974
2700	new CFClient::UI::Label	2975	new CFClient::UI::Label
2701	markup => $short,	2976	markup => $short,
2702	tooltip => $item->{tooltip},	2977	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	2978	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	2979	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	2980	fontsize => $item->{fontsize} || $self->{fontsize},
		2981	max_w => $::WIDTH * 0.44,
2706	color => $item->{color},	2982	fg => $item->{fg},
2707	can_events => 1,	2983	can_events => 1,
2708	can_hover => 1	2984	can_hover => 1
2709	};	2985	};
2710	}	2986	}
2711		2987
…		…
2737	$self->{item}{$group} = {	3013	$self->{item}{$group} = {
2738	id => ++$self->{id},	3014	id => ++$self->{id},
2739	text => $text,	3015	text => $text,
2740	timeout => $timeout,	3016	timeout => $timeout,
2741	tooltip => $text,	3017	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	3018	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	3019	pri => 0,
2745	count => 1,	3020	count => 1,
2746	%arg,	3021	%arg,
2747	};	3022	};
2748	}	3023	}
2749		3024
2750	$self->reorder;	3025	$self->reorder;
2751	}	3026	}
2752		3027
		3028	sub reconfigure {
		3029	my ($self) = @_;
		3030
		3031	delete $_->{label}
		3032	for values %{ $self->{item} || {} };
		3033
		3034	$self->reorder;
		3035	$self->SUPER::reconfigure;
		3036	}
		3037
2753	#############################################################################	3038	#############################################################################
2754		3039
2755	package CFClient::UI::Root;	3040	package CFClient::UI::Root;
2756		3041
2757	our @ISA = CFClient::UI::Container::;	3042	our @ISA = CFClient::UI::Container::;
…		…
2787	}	3072	}
2788		3073
2789	sub size_allocate {	3074	sub size_allocate {
2790	my ($self, $w, $h) = @_;	3075	my ($self, $w, $h) = @_;
2791		3076
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) {	3077	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3078	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		3079
		3080	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3081	if exists $child->{req_x};
		3082
		3083	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3084	if exists $child->{req_y};
		3085
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3086	$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;	3087	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3088
2803	$child->configure ($X, $Y, $W, $H);	3089	$child->configure ($X, $Y, $W, $H);
2804	}	3090	}
2805	}	3091	}
2806		3092
2807	sub coord2local {	3093	sub coord2local {
…		…
2824	}	3110	}
2825		3111
2826	sub add {	3112	sub add {
2827	my ($self, @children) = @_;	3113	my ($self, @children) = @_;
2828		3114
		3115	for (my @widgets = @children; my $w = pop @widgets; ) {
		3116	push @widgets, $w->children;
		3117	$w->{root} = $self;
		3118	$w->{visible} = 1;
		3119	}
		3120
2829	for my $child (@children) {	3121	for my $child (@children) {
2830	$child->{toplevel} = 1;	3122	$child->{is_toplevel} = 1;
2831		3123
2832	# integerise window positions	3124	# integerise window positions
2833	$child->{x} = int $child->{x};	3125	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};	3126	$child->{y} = int $child->{y};
2835	}	3127	}
2836		3128
2837	$self->SUPER::add (@children);	3129	$self->SUPER::add (@children);
		3130	}
		3131
		3132	sub remove {
		3133	my ($self, @children) = @_;
		3134
		3135	$self->SUPER::remove (@children);
		3136
		3137	while (@children) {
		3138	my $w = pop @children;
		3139	push @children, $w->children;
		3140	$w->set_invisible;
		3141	}
2838	}	3142	}
2839		3143
2840	sub on_refresh {	3144	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3145	my ($self, $id, $cb) = @_;
2842		3146
…		…
2895	$w = 0 if $w < 0;	3199	$w = 0 if $w < 0;
2896	$h = 0 if $h < 0;	3200	$h = 0 if $h < 0;
2897		3201
2898	$widget->{w} = $w;	3202	$widget->{w} = $w;
2899	$widget->{h} = $h;	3203	$widget->{h} = $h;
2900	$widget->size_allocate ($w, $h);
2901	$widget->emit (size_allocate => $w, $h);	3204	$widget->emit (size_allocate => $w, $h);
2902	}	3205	}
2903	}	3206	}
2904		3207
2905	while ($self->{post_alloc_hook}) {	3208	while ($self->{post_alloc_hook}) {
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3214	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3215	glClear GL_COLOR_BUFFER_BIT;
2913		3216
2914	glMatrixMode GL_PROJECTION;	3217	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3218	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3219	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3220	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3221	glLoadIdentity;
2919		3222
2920	$self->_draw;	3223	$self->_draw;
2921	}	3224	}
…		…
2923	#############################################################################	3226	#############################################################################
2924		3227
2925	package CFClient::UI;	3228	package CFClient::UI;
2926		3229
2927	$ROOT = new CFClient::UI::Root;	3230	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3231	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3232
2930	1	3233	1
2931		3234

Diff Legend

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