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.200 by root, Sat May 13 00:27:09 2006 UTC vs.
Revision 1.232 by root, Thu May 25 02:23:14 2006 UTC

…		…
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		12
13	our $ROOT;	13	our $ROOT;
14	our $TOOLTIP;	14	our $TOOLTIP;
15	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
16		18
17	sub check_tooltip {	19	sub check_tooltip {
18	if (!$GRAB) {	20	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	31	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
39	$TOOLTIP->check_size;	40	$TOOLTIP->check_size;
40	$TOOLTIP->update;	41	$TOOLTIP->update;
41	}	42	}
…		…
49	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
50	}	51	}
51		52
52	# class methods for events	53	# class methods for events
53	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
55	if $FOCUS;	56	if $FOCUS;
56	}	57	}
57		58
58	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
60	if $FOCUS;	61	if $FOCUS;
61	}	62	}
62		63
63	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
64	my ($ev) = @_;	65	my ($ev) = @_;
…		…
73	check_tooltip;	74	check_tooltip;
74	}	75	}
75		76
76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
77		78
78	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81	}
82	}	81	}
83		82
84	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
85	my ($ev) = @_;	84	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
87		86
88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89		88
90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91		90
92	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95	}
96		93
97	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
98	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
99	$grab->update if $grab;	96	$grab->update if $grab;
100	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
116	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
117		114
118	check_tooltip;	115	check_tooltip;
119	}	116	}
120		117
121	if ($HOVER) {
122	($x, $y) = $HOVER->coord2local ($x, $y);
123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124	}	119	if $HOVER;
125	}	120	}
126		121
127	# convert position array to integers	122	# convert position array to integers
128	sub harmonize {	123	sub harmonize {
129	my ($vals) = @_;	124	my ($vals) = @_;
…		…
133	for (@$vals) {	128	for (@$vals) {
134	my $i = int $_ + $rem;	129	my $i = int $_ + $rem;
135	$rem += $_ - $i;	130	$rem += $_ - $i;
136	$_ = $i;	131	$_ = $i;
137	}	132	}
		133	}
		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
		151	# call when resolution changes etc.
		152	sub rescale_widgets {
		153	my ($sx, $sy) = @_;
		154
		155	for my $widget (values %WIDGET) {
		156	if ($widget->{is_toplevel}) {
		157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		165	}
		166	}
		167
		168	reconfigure_widgets;
138	}	169	}
139		170
140	#############################################################################	171	#############################################################################
141		172
142	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
160	if (/^connect_(.*)$/) {	191	if (/^connect_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	192	$self->connect ($1 => delete $self->{$_});
162	}	193	}
163	}	194	}
164		195
		196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		197
165	$self	198	$self
166	}	199	}
167		200
168	sub destroy {	201	sub destroy {
169	my ($self) = @_;	202	my ($self) = @_;
…		…
172	%$self = ();	205	%$self = ();
173	}	206	}
174		207
175	sub show {	208	sub show {
176	my ($self) = @_;	209	my ($self) = @_;
177
178	return if $self->{parent};	210	return if $self->{parent};
179		211
180	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
181	}	213	}
182		214
183	sub hide {	215	sub show_centered {
184	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};
185		234
186	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
187	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;
188		248
189	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
190	if $self->{parent};	250	if $self->{parent};
191	}	251	}
192		252
…		…
242		302
243	sub size_allocate {	303	sub size_allocate {
244	# nothing to be done	304	# nothing to be done
245	}	305	}
246		306
247	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {	307	sub reconfigure {
252	my ($self) = @_;	308	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256		309
257	$self->check_size (1);	310	$self->check_size (1);
258	$self->update;	311	$self->update;
259	}	312	}
260		313
		314	sub children {
		315	}
		316
261	sub set_max_size {	317	sub set_max_size {
262	my ($self, $w, $h) = @_;	318	my ($self, $w, $h) = @_;
263		319
264	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
265	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
		322	}
		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	}
266	}	333	}
267		334
268	# translate global coordinates to local coordinate system	335	# translate global coordinates to local coordinate system
269	sub coord2local {	336	sub coord2local {
270	my ($self, $x, $y) = @_;	337	my ($self, $x, $y) = @_;
…		…
285	return if $FOCUS == $self;	352	return if $FOCUS == $self;
286	return unless $self->{can_focus};	353	return unless $self->{can_focus};
287		354
288	my $focus = $FOCUS; $FOCUS = $self;	355	my $focus = $FOCUS; $FOCUS = $self;
289		356
290	$self->emit (focus_in => $focus);	357	$self->_emit (focus_in => $focus);
291		358
292	$focus->update if $focus;	359	$focus->update if $focus;
293	$FOCUS->update;	360	$FOCUS->update;
294	}	361	}
295		362
…		…
298		365
299	return unless $FOCUS == $self;	366	return unless $FOCUS == $self;
300		367
301	my $focus = $FOCUS; undef $FOCUS;	368	my $focus = $FOCUS; undef $FOCUS;
302		369
303	$self->emit (focus_out => $focus);	370	$self->_emit (focus_out => $focus);
304		371
305	$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;
306	}	376	}
307		377
308	sub mouse_motion { }	378	sub mouse_motion { }
309	sub button_up { }	379	sub button_up { }
310	sub key_down { }	380	sub key_down { }
311	sub key_up { }	381	sub key_up { }
312		382
313	sub button_down {	383	sub button_down {
314	my ($self, $ev, $x, $y) = @_;	384	my ($self, $ev, $x, $y) = @_;
315		385
316	$self->focus_in;	386	$self->focus_in;
…		…
356	glVertex $self->{w}, 0;	426	glVertex $self->{w}, 0;
357	glVertex $self->{w}, $self->{h};	427	glVertex $self->{w}, $self->{h};
358	glVertex 0 , $self->{h};	428	glVertex 0 , $self->{h};
359	glEnd;	429	glEnd;
360	glPopMatrix;	430	glPopMatrix;
361	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;
362	}	432	}
363	}	433	}
364		434
365	sub _draw {	435	sub _draw {
366	my ($self) = @_;	436	my ($self) = @_;
…		…
386	Scalar::Util::weaken ($self->{parent} = $parent);	456	Scalar::Util::weaken ($self->{parent} = $parent);
387		457
388	# TODO: req_w _does_change after ->reconfigure	458	# TODO: req_w _does_change after ->reconfigure
389	$self->check_size	459	$self->check_size
390	unless exists $self->{req_w};	460	unless exists $self->{req_w};
		461
		462	$self->show;
391	}	463	}
392		464
393	sub check_size {	465	sub check_size {
394	my ($self, $forced) = @_;	466	my ($self, $forced) = @_;
395		467
…		…
408	my ($self, $signal, $cb) = @_;	480	my ($self, $signal, $cb) = @_;
409		481
410	push @{ $self->{signal_cb}{$signal} }, $cb;	482	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	483	}
412		484
		485	sub _emit {
		486	my ($self, $signal, @args) = @_;
		487
		488	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		489	}
		490
413	sub emit {	491	sub emit {
414	my ($self, $signal, @args) = @_;	492	my ($self, $signal, @args) = @_;
415		493
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	494	$self->_emit ($signal, @args)
		495	|| $self->$signal (@args);
417	}	496	}
418		497
419	sub DESTROY {	498	sub DESTROY {
420	my ($self) = @_;	499	my ($self) = @_;
421		500
		501	delete $WIDGET{$self+0};
422	#$self->deactivate;	502	#$self->deactivate;
423	}	503	}
424		504
425	#############################################################################	505	#############################################################################
426		506
…		…
435	my $class = shift;	515	my $class = shift;
436		516
437	# range [value, low, high, page]	517	# range [value, low, high, page]
438		518
439	$class->SUPER::new (	519	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	520	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	521	#active_bg => [1, 1, 1, 0.5],
442	@_	522	@_
443	)	523	)
444	}	524	}
445		525
446	sub _draw {	526	sub _draw {
447	my ($self) = @_;	527	my ($self) = @_;
448		528
		529	my $color = $FOCUS == $self && $self->{active_bg}
		530	? $self->{active_bg}
		531	: $self->{bg};
		532
		533	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	534	my ($w, $h) = @$self{qw(w h)};
450		535
451	glEnable GL_BLEND;	536	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	537	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	538	glColor @$color;
454		539
455	glBegin GL_QUADS;	540	glBegin GL_QUADS;
456	glVertex 0 , 0;	541	glVertex 0 , 0;
457	glVertex 0 , $h;	542	glVertex 0 , $h;
458	glVertex $w, $h;	543	glVertex $w, $h;
459	glVertex $w, 0;	544	glVertex $w, 0;
460	glEnd;	545	glEnd;
461		546
462	glDisable GL_BLEND;	547	glDisable GL_BLEND;
		548	}
463	}	549	}
464		550
465	#############################################################################	551	#############################################################################
466		552
467	package CFClient::UI::Empty;	553	package CFClient::UI::Empty;
…		…
651	$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 {
652	glClearColor 0, 0, 0, 0;	738	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	739	glClear GL_COLOR_BUFFER_BIT;
654		740
655	$self->_render;	741	$self->_render;
656	# glColorMask 1, 1, 1, 0;
657	# glEnable GL_BLEND;
658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659	# glRasterPos 0, 0;
660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
661	# glDisable GL_BLEND;
662	# glColorMask 1, 1, 1, 1;
663	};	742	};
664	}	743	}
665		744
666	sub _draw {	745	sub _draw {
667	my ($self) = @_;	746	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	750	my $tex = $self->{texture}
672	or return;	751	or return;
673		752
674	glEnable GL_TEXTURE_2D;	753	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	754	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	755	glColor 1, 1, 1, 1;
677		756
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	757	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		758
680	glDisable GL_TEXTURE_2D;	759	glDisable GL_TEXTURE_2D;
681	}	760	}
…		…
688		767
689	sub size_request {	768	sub size_request {
690	my ($self) = @_;	769	my ($self) = @_;
691		770
692	@$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)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		772
695	@$self{qw(child_w child_h)}	773	@$self{qw(child_w child_h)}
696	}	774	}
697		775
698	sub size_allocate {	776	sub size_allocate {
699	my ($self, $w, $h) = @_;	777	my ($self, $w, $h) = @_;
700		778
		779	my ($cw, $ch) = @$self{qw(child_w child_h)};
		780	# $w = $self->{w};
		781	$self->child->configure (0, 0, $cw, $ch);
701	$self->update;	782	$self->update;
702	}	783	}
703		784
704	sub set_offset {	785	sub set_offset {
705	my ($self, $x, $y) = @_;	786	my ($self, $x, $y) = @_;
…		…
759		840
760	my $slider = new CFClient::UI::Slider	841	my $slider = new CFClient::UI::Slider
761	vertical => 1,	842	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	843	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	844	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	845	$self->{vp}->set_offset (0, $_[1]);
765	},	846	},
766	;	847	;
767		848
768	$self = $class->SUPER::new (	849	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	850	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	851	slider => $slider,
771	@_,	852	@_,
772	);	853	);
773		854
774	$self->{vp}->add ($self->{scrolled});	855	$self->{vp}->add ($self->{scrolled});
775	$self->add ($self->{vp});	856	$self->add ($self->{vp});
776	$self->add ($self->{slider});	857	$self->add ($self->{slider});
777		858
778	$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]);
779	}	869	}
780		870
781	#TODO# update range on size_allocate depending on child	871	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	872	# update viewport offset on scroll
783		873
…		…
837	my $class = shift;	927	my $class = shift;
838		928
839	# TODO: user_x, user_y, overwrite moveto?	929	# TODO: user_x, user_y, overwrite moveto?
840		930
841	my $self = $class->SUPER::new (	931	my $self = $class->SUPER::new (
842	bg => [1, 1, 1, 1],	932	bg => [1, 1, 1, 1],
843	border_bg => [1, 1, 1, 1],	933	border_bg => [1, 1, 1, 1],
844	border => 0.6,	934	border => 0.6,
		935	is_toplevel => 1,
845	can_events => 1,	936	can_events => 1,
846	@_	937	@_
847	);	938	);
848		939
849	$self->{title} &&= new CFClient::UI::Label	940	$self->{title} &&= new CFClient::UI::Label
850	align => 0,	941	align => 0,
…		…
874	my ($self, $w, $h) = @_;	965	my ($self, $w, $h) = @_;
875		966
876	$h -= List::Util::max 0, $self->border * 2;	967	$h -= List::Util::max 0, $self->border * 2;
877	$w -= List::Util::max 0, $self->border * 2;	968	$w -= List::Util::max 0, $self->border * 2;
878		969
879	$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)
880	if $self->{title};	971	if $self->{title};
881		972
882	$self->child->configure ($self->border, $self->border, $w, $h);	973	$self->child->configure ($self->border, $self->border, $w, $h);
883	}	974	}
884		975
…		…
1245		1336
1246	#############################################################################	1337	#############################################################################
1247		1338
1248	package CFClient::UI::Label;	1339	package CFClient::UI::Label;
1249		1340
1250	our @ISA = CFClient::UI::Base::;	1341	our @ISA = CFClient::UI::DrawBG::;
1251		1342
1252	use CFClient::OpenGL;	1343	use CFClient::OpenGL;
1253		1344
1254	sub new {	1345	sub new {
1255	my ($class, %arg) = @_;	1346	my ($class, %arg) = @_;
1256		1347
1257	my $self = $class->SUPER::new (	1348	my $self = $class->SUPER::new (
1258	fg => [1, 1, 1],	1349	fg => [1, 1, 1],
		1350	#bg => none
		1351	#active_bg => none
1259	#font => default_font	1352	#font => default_font
1260	#text => initial text	1353	#text => initial text
1261	#markup => initial narkup	1354	#markup => initial narkup
		1355	#max_w => maximum pixel width
		1356	ellipsise => 3, # end
1262	layout => (new CFClient::Layout),	1357	layout => (new CFClient::Layout),
1263	fontsize => 1,	1358	fontsize => 1,
1264	align => -1,	1359	align => -1,
1265	valign => -1,	1360	valign => -1,
1266	padding => 2,	1361	padding => 2,
…		…
1281	}	1376	}
1282		1377
1283	$self	1378	$self
1284	}	1379	}
1285		1380
1286	sub escape {	1381	sub escape($) {
1287	local $_ = $_[1];	1382	local $_ = $_[0];
1288		1383
1289	s/&/&amp;/g;	1384	s/&/&amp;/g;
1290	s/>/&gt;/g;	1385	s/>/&gt;/g;
1291	s/</&lt;/g;	1386	s/</&lt;/g;
1292		1387
1293	$_[1]	1388	$_
1294	}	1389	}
1295		1390
1296	sub update {	1391	sub update {
1297	my ($self) = @_;	1392	my ($self) = @_;
1298		1393
…		…
1331	sub size_request {	1426	sub size_request {
1332	my ($self) = @_;	1427	my ($self) = @_;
1333		1428
1334	$self->{layout}->set_font ($self->{font}) if $self->{font};	1429	$self->{layout}->set_font ($self->{font}) if $self->{font};
1335	$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});
1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1433	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337		1434
1338	my ($w, $h) = $self->{layout}->size;	1435	my ($w, $h) = $self->{layout}->size;
1339		1436
1340	if (exists $self->{template}) {	1437	if (exists $self->{template}) {
…		…
1370	}	1467	}
1371		1468
1372	sub _draw {	1469	sub _draw {
1373	my ($self) = @_;	1470	my ($self) = @_;
1374		1471
		1472	$self->SUPER::_draw; # draw background, if applicable
		1473
1375	my $tex = $self->{texture} ||= do {	1474	my $tex = $self->{texture} ||= do {
1376	$self->{layout}->set_foreground (@{$self->{fg}});	1475	$self->{layout}->set_foreground (@{$self->{fg}});
1377	$self->{layout}->set_font ($self->{font}) if $self->{font};	1476	$self->{layout}->set_font ($self->{font}) if $self->{font};
1378	$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});
1379	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1480	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380		1481
1381	my $tex = new_from_layout CFClient::Texture $self->{layout};	1482	my $tex = new_from_layout CFClient::Texture $self->{layout};
1382		1483
1383	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1484	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1384	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1485	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385	: ($self->{w} - $tex->{w}) * 0.5;	1486	: ($self->{w} - $tex->{w}) * 0.5);
1386		1487
1387	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1488	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1388	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1489	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389	: ($self->{h} - $tex->{h}) * 0.5;	1490	: ($self->{h} - $tex->{h}) * 0.5);
1390		1491
1391	$tex	1492	$tex
1392	};	1493	};
1393		1494
1394	glEnable GL_TEXTURE_2D;	1495	glEnable GL_TEXTURE_2D;
…		…
1422	active_fg => [0, 0, 0],	1523	active_fg => [0, 0, 0],
1423	can_hover => 1,	1524	can_hover => 1,
1424	can_focus => 1,	1525	can_focus => 1,
1425	valign => 0,	1526	valign => 0,
1426	can_events => 1,	1527	can_events => 1,
		1528	#text => ...
1427	@_	1529	@_
1428	)	1530	)
1429	}	1531	}
1430		1532
1431	sub _set_text {	1533	sub _set_text {
…		…
1441	$self->{text} = $text;	1543	$self->{text} = $text;
1442		1544
1443	$text =~ s/./*/g if $self->{hidden};	1545	$text =~ s/./*/g if $self->{hidden};
1444	$self->{layout}->set_text ("$text ");	1546	$self->{layout}->set_text ("$text ");
1445		1547
1446	$self->emit (changed => $self->{text});	1548	$self->_emit (changed => $self->{text});
1447	}	1549	}
1448		1550
1449	sub set_text {	1551	sub set_text {
1450	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1451		1553
1452	$self->{cursor} = length $text;	1554	$self->{cursor} = length $text;
1453	$self->_set_text ($text);	1555	$self->_set_text ($text);
		1556	$self->update;
1454	$self->check_size;	1557	$self->check_size;
1455	$self->update;
1456	}	1558	}
1457		1559
1458	sub get_text {	1560	sub get_text {
1459	$_[0]{text}	1561	$_[0]{text}
1460	}	1562	}
…		…
1463	my ($self) = @_;	1565	my ($self) = @_;
1464		1566
1465	my ($w, $h) = $self->SUPER::size_request;	1567	my ($w, $h) = $self->SUPER::size_request;
1466		1568
1467	($w + 1, $h) # add 1 for cursor	1569	($w + 1, $h) # add 1 for cursor
1468	}
1469
1470	sub size_allocate {
1471	my ($self, $w, $h) = @_;
1472
1473	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474	}	1570	}
1475		1571
1476	sub key_down {	1572	sub key_down {
1477	my ($self, $ev) = @_;	1573	my ($self, $ev) = @_;
1478		1574
…		…
1493	} elsif ($sym == CFClient::SDLK_HOME) {	1589	} elsif ($sym == CFClient::SDLK_HOME) {
1494	$self->{cursor} = 0;	1590	$self->{cursor} = 0;
1495	} elsif ($sym == CFClient::SDLK_END) {	1591	} elsif ($sym == CFClient::SDLK_END) {
1496	$self->{cursor} = length $text;	1592	$self->{cursor} = length $text;
1497	} elsif ($uni == 27) {	1593	} elsif ($uni == 27) {
1498	$self->emit ('escape');	1594	$self->_emit ('escape');
1499	} elsif ($uni) {	1595	} elsif ($uni) {
1500	substr $text, $self->{cursor}++, 0, chr $uni;	1596	substr $text, $self->{cursor}++, 0, chr $uni;
1501	}	1597	}
1502		1598
1503	$self->_set_text ($text);	1599	$self->_set_text ($text);
1504	$self->update;	1600	$self->update;
		1601	$self->check_size;
1505	}	1602	}
1506		1603
1507	sub focus_in {	1604	sub focus_in {
1508	my ($self) = @_;	1605	my ($self) = @_;
1509		1606
…		…
1589	if ($sym == 13) {	1686	if ($sym == 13) {
1590	unshift @{$self->{history}},	1687	unshift @{$self->{history}},
1591	my $txt = $self->get_text;	1688	my $txt = $self->get_text;
1592	$self->{history_pointer} = -1;	1689	$self->{history_pointer} = -1;
1593	$self->{history_saveback} = '';	1690	$self->{history_saveback} = '';
1594	$self->emit (activate => $txt);	1691	$self->_emit (activate => $txt);
1595	$self->update;	1692	$self->update;
1596		1693
1597	} elsif ($sym == CFClient::SDLK_UP) {	1694	} elsif ($sym == CFClient::SDLK_UP) {
1598	if ($self->{history_pointer} < 0) {	1695	if ($self->{history_pointer} < 0) {
1599	$self->{history_saveback} = $self->get_text;	1696	$self->{history_saveback} = $self->get_text;
…		…
1638	my $class = shift;	1735	my $class = shift;
1639		1736
1640	$class->SUPER::new (	1737	$class->SUPER::new (
1641	padding => 4,	1738	padding => 4,
1642	fg => [1, 1, 1],	1739	fg => [1, 1, 1],
1643	bg => [1, 1, 1, 0.2],
1644	active_fg => [0, 0, 1],	1740	active_fg => [0, 0, 1],
1645	can_hover => 1,	1741	can_hover => 1,
1646	align => 0,	1742	align => 0,
1647	valign => 0,	1743	valign => 0,
1648	can_events => 1,	1744	can_events => 1,
1649	@_	1745	@_
1650	)	1746	)
1651	}	1747	}
1652		1748
		1749	sub activate { }
		1750
1653	sub button_up {	1751	sub button_up {
1654	my ($self, $ev, $x, $y) = @_;	1752	my ($self, $ev, $x, $y) = @_;
1655		1753
		1754	$self->emit ("activate")
1656	if ($x >= 0 && $x < $self->{w}	1755	if $x >= 0 && $x < $self->{w}
1657	&& $y >= 0 && $y < $self->{h}) {	1756	&& $y >= 0 && $y < $self->{h};
1658	$self->emit ("activate");
1659	}
1660	}	1757	}
1661		1758
1662	sub _draw {	1759	sub _draw {
1663	my ($self) = @_;	1760	my ($self) = @_;
1664		1761
…		…
1696		1793
1697	$class->SUPER::new (	1794	$class->SUPER::new (
1698	padding => 2,	1795	padding => 2,
1699	fg => [1, 1, 1],	1796	fg => [1, 1, 1],
1700	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],
1701	state => 0,	1800	state => 0,
1702	can_hover => 1,	1801	can_hover => 1,
1703	@_	1802	@_
1704	)	1803	)
1705	}	1804	}
…		…
1714	my ($self, $ev, $x, $y) = @_;	1813	my ($self, $ev, $x, $y) = @_;
1715		1814
1716	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1815	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1816	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718	$self->{state} = !$self->{state};	1817	$self->{state} = !$self->{state};
1719	$self->emit (changed => $self->{state});	1818	$self->_emit (changed => $self->{state});
1720	}	1819	}
1721	}	1820	}
1722		1821
1723	sub _draw {	1822	sub _draw {
1724	my ($self) = @_;	1823	my ($self) = @_;
…		…
1989	qw(s1_slider.png s1_slider_bg.png);	2088	qw(s1_slider.png s1_slider_bg.png);
1990		2089
1991	sub new {	2090	sub new {
1992	my $class = shift;	2091	my $class = shift;
1993		2092
1994	# range [value, low, high, page]	2093	# range [value, low, high, page, unit]
1995		2094
1996	# TODO: 0-width page	2095	# TODO: 0-width page
1997	# TODO: req_w/h are wrong with vertical	2096	# TODO: req_w/h are wrong with vertical
1998	# TODO: calculations are off	2097	# TODO: calculations are off
1999	my $self = $class->SUPER::new (	2098	my $self = $class->SUPER::new (
2000	fg => [1, 1, 1],	2099	fg => [1, 1, 1],
2001	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],
2002	range => [0, 0, 100, 10],	2103	range => [0, 0, 100, 10, 0],
2003	req_w => $::WIDTH / 80,	2104	req_w => $::WIDTH / 80,
2004	req_h => $::WIDTH / 80,	2105	req_h => $::WIDTH / 80,
2005	vertical => 0,	2106	vertical => 0,
2006	can_hover => 1,	2107	can_hover => 1,
2007	inner_pad => 5,	2108	inner_pad => 0.02,
2008	@_	2109	@_
2009	);	2110	);
2010		2111
		2112	$self->set_value ($self->{range}[0]);
		2113	$self->update;
		2114
2011	$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	}
2012	}	2147	}
2013		2148
2014	sub size_request {	2149	sub size_request {
2015	my ($self) = @_;	2150	my ($self) = @_;
2016		2151
…		…
2022		2157
2023	sub button_down {	2158	sub button_down {
2024	my ($self, $ev, $x, $y) = @_;	2159	my ($self, $ev, $x, $y) = @_;
2025		2160
2026	$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
2027	$self->mouse_motion ($ev, $x, $y);	2165	$self->mouse_motion ($ev, $x, $y);
2028	}	2166	}
2029		2167
2030	sub mouse_motion {	2168	sub mouse_motion {
2031	my ($self, $ev, $x, $y) = @_;	2169	my ($self, $ev, $x, $y) = @_;
2032		2170
2033	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
2034	my ($value, $lo, $hi, $page) = @{$self->{range}};	2188	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2189	my $range = ($hi - $page - $lo) || 1e-100;
2035		2190
2036	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2191	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037		2192
2038	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2193	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2194	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040		2195
2041	$x -= $inner_pad_px; # substract the padding	2196	$value = ($value - $lo) / $range;
2042	$x = $x * ($hi - $lo) / $inner_w + $lo;	2197	$value = $value * $self->{scale} + $self->{offset};
2043	$x = $lo if $x < $lo;
2044	$x = $hi - $page if $x > $hi - $page;
2045	$self->{range}[0] = $x;
2046		2198
2047	$self->emit (changed => $x);	2199	$self->{knob_x} = $value - $knob_w * 0.5;
2048	$self->update;	2200	$self->{knob_w} = $knob_w;
2049	}	2201	});
2050	}
2051		2202
2052	# the inner_* stuff is for generating a padding for the slider handle,	2203	$self->SUPER::update;
2053	# so that the handle doesn't leave the texture. This calculation isn't 100%
2054	# correct propably, but it does the job for now
2055	sub _calc_inner_pad_px {
2056	my ($self, $w) = @_;
2057	($w / 100) * $self->{inner_pad} # % to pixels
2058	}	2204	}
2059		2205
2060	sub _draw {	2206	sub _draw {
2061	my ($self) = @_;	2207	my ($self) = @_;
2062		2208
2063	$self->SUPER::_draw ();	2209	$self->SUPER::_draw ();
2064		2210
2065	my ($w, $h) = @$self{qw(w h)};	2211	glScale $self->{w}, $self->{h};
2066		2212
2067	if ($self->{vertical}) {	2213	if ($self->{vertical}) {
2068	# draw a vertical slider like a rotated horizontal slider	2214	# draw a vertical slider like a rotated horizontal slider
2069		2215
		2216	glTranslate 1, 0, 0;
2070	glRotate 90, 0, 0, 1;	2217	glRotate 90, 0, 0, 1;
2071	glTranslate 0, -$self->{w}, 0;
2072
2073	($w, $h) = ($h, $w);
2074	}	2218	}
2075		2219
2076	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2220	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2221	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078		2222
2079	my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081	$hi = $value + 1 if $lo == $hi;
2082
2083	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086	$page = int $page * $inner_w / ($hi - $lo);
2087	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089	$w -= $page;
2090	$page &= ~1;
2091	glTranslate $page * 0.5, 0, 0;
2092	$page ||= 2;
2093
2094	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097	glEnable GL_TEXTURE_2D;	2223	glEnable GL_TEXTURE_2D;
2098	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099		2225
2100	# draw background	2226	# draw background
2101	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2227	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102		2228
2103	# draw handle	2229	# draw handle
2104	$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);
2105		2231
2106	glDisable GL_TEXTURE_2D;	2232	glDisable GL_TEXTURE_2D;
2107	}	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 (@_) }
2108		2275
2109	#############################################################################	2276	#############################################################################
2110		2277
2111	package CFClient::UI::TextView;	2278	package CFClient::UI::TextView;
2112		2279
…		…
2142		2309
2143	$self->{fontsize} = $fontsize;	2310	$self->{fontsize} = $fontsize;
2144	$self->reflow;	2311	$self->reflow;
2145	}	2312	}
2146		2313
2147	sub text_height {
2148	my ($self, $text) = @_;
2149
2150	my $layout = $self->{layout};
2151
2152	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153	$layout->set_width ($self->{children}[0]{w});
2154	$layout->set_markup ($text);
2155
2156	($layout->size)[1]
2157	}
2158
2159	sub reflow {
2160	my ($self) = @_;
2161
2162	$self->{need_reflow}++;
2163	$self->update;
2164	}
2165
2166	sub size_allocate {	2314	sub size_allocate {
2167	my ($self, $w, $h) = @_;	2315	my ($self, $w, $h) = @_;
2168		2316
2169	$self->SUPER::size_allocate ($w, $h);	2317	$self->SUPER::size_allocate ($w, $h);
2170		2318
…		…
2173	$self->{layout}->set_width ($self->{children}[0]{w});	2321	$self->{layout}->set_width ($self->{children}[0]{w});
2174		2322
2175	$self->reflow;	2323	$self->reflow;
2176	}	2324	}
2177		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
2178	sub add_paragraph {	2360	sub add_paragraph {
2179	my ($self, $color, $text) = @_;	2361	my ($self, $color, $text, $indent) = @_;
2180		2362
2181	#TODO: intelligently "reformat" paragraph	2363	for my $line (split /\n/, $text) {
2182		2364	my ($w, $h) = $self->text_size ($line);
2183	my $height = $self->text_height ($text);
2184
2185	$self->{height} += $height;	2365	$self->{height} += $h;
		2366	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2367	}
2186		2368
2187	push @{$self->{par}}, [$height, $color, $text];
2188
2189	$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]);
2190	$self->{children}[1]->update;
2191	}	2370	}
2192		2371
2193	sub update {	2372	sub update {
2194	my ($self) = @_;	2373	my ($self) = @_;
2195		2374
…		…
2198	return unless $self->{h} > 0;	2377	return unless $self->{h} > 0;
2199		2378
2200	delete $self->{texture};	2379	delete $self->{texture};
2201		2380
2202	$ROOT->on_post_alloc ($self, sub {	2381	$ROOT->on_post_alloc ($self, sub {
		2382	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2383
2203	if (delete $self->{need_reflow}) {	2384	if (delete $self->{need_reflow}) {
2204	my $height = 0;	2385	my $height = 0;
2205		2386
2206	$height += $_->[0] = $self->text_height ($_->[2])	2387	my $layout = $self->{layout};
		2388
		2389	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2390
2207	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	}
2208		2402
2209	$self->{height} = $height;	2403	$self->{height} = $height;
2210		2404
2211	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2405	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212		2406
2213	delete $self->{texture};	2407	delete $self->{texture};
2214	}	2408	}
2215		2409
2216	$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 {
2217	glClearColor 0, 0, 0, 0;	2411	glClearColor 0.5, 0.5, 0.5, 0;
2218	glClear GL_COLOR_BUFFER_BIT;	2412	glClear GL_COLOR_BUFFER_BIT;
2219		2413
2220	glEnable GL_TEXTURE_2D;
2221	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223	my $top = int $self->{children}[1]{range}[0];	2414	my $top = int $self->{children}[1]{range}[0];
2224		2415
2225	my $y0 = $top;	2416	my $y0 = $top;
2226	my $y1 = $top + $self->{h};	2417	my $y1 = $top + $H;
2227		2418
2228	my $y = 0;	2419	my $y = 0;
2229		2420
2230	my $layout = $self->{layout};	2421	my $layout = $self->{layout};
2231		2422
2232	$layout->set_font ($self->{font}) if $self->{font};	2423	$layout->set_font ($self->{font}) if $self->{font};
2233		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
2234	for my $par (@{$self->{par}}) {	2429	for my $par (@{$self->{par}}) {
2235	my $h = $par->[0];	2430	my $h = $par->[1];
2236		2431
2237	if ($y0 < $y + $h && $y < $y1) {	2432	if ($y0 < $y + $h && $y < $y1) {
2238	$layout->set_foreground (@{ $par->[1] });	2433	$layout->set_foreground (@{ $par->[2] });
		2434	$layout->set_width ($W - $par->[3]);
2239	$layout->set_markup ($par->[2]);	2435	$layout->set_markup ($par->[4]);
2240		2436
2241	my ($W, $H) = $layout->size;	2437	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242	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;
2243	}	2441	}
2244		2442
2245	$y += $h;	2443	$y += $h;
2246	}	2444	}
2247		2445
2248	glDisable GL_TEXTURE_2D;	2446	glDisable GL_BLEND;
2249	};	2447	};
2250	});	2448	});
2251	}	2449	}
2252		2450
2253	sub _draw {	2451	sub _draw {
2254	my ($self) = @_;	2452	my ($self) = @_;
2255		2453
2256	glEnable GL_TEXTURE_2D;	2454	glEnable GL_TEXTURE_2D;
2257	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2455	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258	glColor 1, 1, 1, 1;	2456	glColor 1, 1, 1, 1;
2259	$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});
2260	glDisable GL_TEXTURE_2D;	2458	glDisable GL_TEXTURE_2D;
2261		2459
2262	$self->{children}[1]->draw;	2460	$self->{children}[1]->draw;
2263		2461
2264	}	2462	}
…		…
2333		2531
2334	# TODO: use animation	2532	# TODO: use animation
2335	if ($self->{state} = !$self->{state}) {	2533	if ($self->{state} = !$self->{state}) {
2336	$CFClient::UI::ROOT->add ($self->{other});	2534	$CFClient::UI::ROOT->add ($self->{other});
2337	$self->{other}->move ($self->coord2global (0, $self->{h}));	2535	$self->{other}->move ($self->coord2global (0, $self->{h}));
2338	$self->emit ("open");	2536	$self->_emit ("open");
2339	} else {	2537	} else {
2340	$CFClient::UI::ROOT->remove ($self->{other});	2538	$CFClient::UI::ROOT->remove ($self->{other});
2341	$self->emit ("close");	2539	$self->_emit ("close");
2342	}	2540	}
2343		2541
2344	$self->emit (changed => $self->{state});	2542	$self->_emit (changed => $self->{state});
2345	}	2543	}
2346		2544
2347	#############################################################################	2545	#############################################################################
2348		2546
2349	package CFClient::UI::Tooltip;	2547	package CFClient::UI::Tooltip;
…		…
2363		2561
2364	sub set_tooltip_from {	2562	sub set_tooltip_from {
2365	my ($self, $widget) = @_;	2563	my ($self, $widget) = @_;
2366		2564
2367	$self->add (new CFClient::UI::Label	2565	$self->add (new CFClient::UI::Label
2368	markup => $widget->{tooltip},	2566	markup => $widget->{tooltip},
2369	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2567	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370	fontsize => 0.8,	2568	fontsize => 0.8,
2371	fg => [0, 0, 0, 1],	2569	fg => [0, 0, 0, 1],
		2570	ellipsise => 0,
2372	font => ($widget->{tooltip_font} || $::FONT_PROP),	2571	font => ($widget->{tooltip_font} || $::FONT_PROP),
2373	);	2572	);
2374	}	2573	}
2375		2574
2376	sub size_request {	2575	sub size_request {
2377	my ($self) = @_;	2576	my ($self) = @_;
…		…
2423	use CFClient::OpenGL;	2622	use CFClient::OpenGL;
2424		2623
2425	sub new {	2624	sub new {
2426	my $class = shift;	2625	my $class = shift;
2427		2626
2428	$class->SUPER::new (	2627	my $self = $class->SUPER::new (
2429	aspect => 1,	2628	aspect => 1,
2430	@_,	2629	@_,
2431	)	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
2432	}	2647	}
2433		2648
2434	sub size_request {	2649	sub size_request {
2435	(32, 8)	2650	(32, 8)
2436	}	2651	}
2437		2652
		2653	sub update {
		2654	my ($self) = @_;
		2655
		2656	return unless $self->{visible};
		2657
		2658	$self->SUPER::update;
		2659	}
		2660
2438	sub _draw {	2661	sub _draw {
2439	my ($self) = @_;	2662	my ($self) = @_;
2440		2663
2441	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
2442	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2675	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443		2676
2444	# TODO animation
2445	if ($tex) {	2677	if ($tex) {
2446	glEnable GL_TEXTURE_2D;	2678	glEnable GL_TEXTURE_2D;
2447	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2679	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448	glColor 1, 1, 1, 1;	2680	glColor 1, 1, 1, 1;
2449	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2681	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450	glDisable GL_TEXTURE_2D;	2682	glDisable GL_TEXTURE_2D;
2451	}	2683	}
2452	}	2684	}
2453		2685
		2686	sub DESTROY {
		2687	my ($self) = @_;
		2688
		2689	$self->{timer}->cancel
		2690	if $self->{timer};
		2691
		2692	$self->SUPER::DESTROY;
		2693	}
		2694
2454	#############################################################################	2695	#############################################################################
2455		2696
2456	package CFClient::UI::InventoryItem;	2697	package CFClient::UI::InventoryItem;
2457		2698
2458	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	}
2459		2726
2460	sub new {	2727	sub new {
2461	my $class = shift;	2728	my $class = shift;
2462		2729
2463	my %args = @_;	2730	my %args = @_;
2464		2731
2465	my $item = delete $args{item};	2732	my $item = delete $args{item};
2466		2733
2467	my $desc = $item->{nrof} < 2	2734	my $desc = _item_to_desc ($item);
2468	? $item->{name}
2469	: "$item->{nrof} $item->{name_pl}";
2470
2471		2735
2472	my $self = $class->SUPER::new (	2736	my $self = $class->SUPER::new (
2473	can_hover => 1,	2737	can_hover => 1,
2474	can_events => 1,	2738	can_events => 1,
2475	tooltip => (CFClient::UI::Label->escape ($desc)	2739	tooltip => ((CFClient::UI::Label::escape $desc)
2476	. "\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>"),
2477	connect_button_down => sub {	2741	connect_button_down => sub {
2478	my ($self, $ev, $x, $y) = @_;	2742	my ($self, $ev, $x, $y) = @_;
2479		2743
2480	# 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");
2481	if ($ev->{button} == 1) {	2753	} elsif ($ev->{button} == 1) {
2482	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2754	$::CONN->send ("examine $item->{tag}");
2483	} elsif ($ev->{button} == 2) {	2755	} elsif ($ev->{button} == 2) {
2484	$::CONN->send ("apply $item->{tag}");	2756	$::CONN->send ("apply $item->{tag}");
2485	} elsif ($ev->{button} == 3) {	2757	} elsif ($ev->{button} == 3) {
2486	CFClient::UI::Menu->new (	2758	my @menu_items = (
2487	items => [
2488	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2759	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489	[
2490	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491	sub { $::CONN->send ("lock $item->{tag}") },
2492	],
2493	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2760	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2494	["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}) }],
2495	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2769	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2770	)
2496	],	2771	),
2497	)->popup ($ev);	2772	);
		2773
		2774	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2498	}	2775	}
2499		2776
2500	1	2777	1
2501	},	2778	},
2502	%args	2779	%args
2503	);	2780	);
		2781
2504		2782
2505	$self->add (new CFClient::UI::Face	2783	$self->add (new CFClient::UI::Face
2506	can_events => 0,	2784	can_events => 0,
2507	face => $item->{face},	2785	face => $item->{face},
2508	anim => $item->{anim},	2786	anim => $item->{anim},
2509	animspeed => $item->{animspeed},	2787	animspeed => $item->{animspeed},
2510	);	2788	);
2511		2789
2512	$self->add (new CFClient::UI::Label	2790	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2513	can_events => 0,	2791
2514	text => $desc,	2792	$self->{item} = $item;
2515	);	2793
		2794	$self->update_item;
2516		2795
2517	$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);
2518	}	2805	}
2519		2806
2520	#############################################################################	2807	#############################################################################
2521		2808
2522	package CFClient::UI::Inventory;	2809	package CFClient::UI::Inventory;
…		…
2525		2812
2526	sub new {	2813	sub new {
2527	my $class = shift;	2814	my $class = shift;
2528		2815
2529	my $self = $class->SUPER::new (	2816	my $self = $class->SUPER::new (
2530	scrolled => (new CFClient::UI::VBox),	2817	scrolled => (new CFClient::UI::Table),
2531	@_,	2818	@_,
2532	);	2819	);
2533		2820
2534	$self	2821	$self
2535	}	2822	}
…		…
2538	my ($self, $items) = @_;	2825	my ($self, $items) = @_;
2539		2826
2540	$self->{scrolled}->clear;	2827	$self->{scrolled}->clear;
2541	return unless $items;	2828	return unless $items;
2542		2829
2543	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2830	my @items = sort {
		2831	($a->{type} <=> $b->{type})
		2832	or ($a->{name} cmp $b->{name})
		2833	} @$items;
2544		2834
2545	$self->{real_items} = \@items;	2835	$self->{real_items} = \@items;
2546		2836
2547	for my $item (@items) {	2837	for my $item (@items) {
2548	my $desc = $item->{nrof} < 2	2838	$item->{item} = $item;
2549	? $item->{name}
2550	: "$item->{nrof} $item->{name_pl}";
2551
2552	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2839	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2840	$item->update_item ();
		2841	}
		2842
		2843	my $i = 0;
		2844	for (@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);
2553	}	2848	}
2554		2849
2555	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2850	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556	}	2851	}
2557		2852
…		…
2600		2895
2601	# 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)
2602	sub popup {	2897	sub popup {
2603	my ($self, $ev) = @_;	2898	my ($self, $ev) = @_;
2604		2899
2605	$self->emit ("popdown");	2900	$self->_emit ("popdown");
2606		2901
2607	# maybe save $GRAB? must be careful about events...	2902	# maybe save $GRAB? must be careful about events...
2608	$GRAB = $self;	2903	$GRAB = $self;
2609	$self->{button} = $ev->{button};	2904	$self->{button} = $ev->{button};
2610		2905
…		…
2625		2920
2626	if ($ev->{button} == $self->{button}) {	2921	if ($ev->{button} == $self->{button}) {
2627	undef $GRAB;	2922	undef $GRAB;
2628	$self->hide;	2923	$self->hide;
2629		2924
2630	$self->emit ("popdown");	2925	$self->_emit ("popdown");
2631	$self->{hover}[1]->() if $self->{hover};	2926	$self->{hover}[1]->() if $self->{hover};
2632	}	2927	}
2633	}	2928	}
2634		2929
2635	#############################################################################	2930	#############################################################################
2636		2931
2637	package CFClient::UI::Statusbox;	2932	package CFClient::UI::Statusbox;
2638		2933
2639	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	}
2640		2944
2641	sub reorder {	2945	sub reorder {
2642	my ($self) = @_;	2946	my ($self) = @_;
2643	my $NOW = time;	2947	my $NOW = time;
2644		2948
…		…
2663	? "<b>$item->{count} ×</b> $item->{text}"	2967	? "<b>$item->{count} ×</b> $item->{text}"
2664	: $item->{text};	2968	: $item->{text};
2665		2969
2666	for ($short) {	2970	for ($short) {
2667	s/^\s+//;	2971	s/^\s+//;
2668	s/\012.*/…/s;	2972	s/\s+/ /g;
2669	my $len = int 40 / $item->{fontsize};
2670	substr $_, $len, length, "…" if $len < length;
2671	}	2973	}
2672		2974
2673	new CFClient::UI::Label	2975	new CFClient::UI::Label
2674	markup => $short,	2976	markup => $short,
2675	tooltip => $item->{tooltip},	2977	tooltip => $item->{tooltip},
2676	tooltip_font => $::FONT_PROP,	2978	tooltip_font => $::FONT_PROP,
2677	tooltip_width => 0.67,	2979	tooltip_width => 0.67,
2678	fontsize => $item->{fontsize},	2980	fontsize => $item->{fontsize} || $self->{fontsize},
		2981	max_w => $::WIDTH * 0.44,
2679	color => $item->{color},	2982	fg => $item->{fg},
2680	can_events => 1,	2983	can_events => 1,
2681	can_hover => 1	2984	can_hover => 1
2682	};	2985	};
2683	}	2986	}
2684		2987
…		…
2710	$self->{item}{$group} = {	3013	$self->{item}{$group} = {
2711	id => ++$self->{id},	3014	id => ++$self->{id},
2712	text => $text,	3015	text => $text,
2713	timeout => $timeout,	3016	timeout => $timeout,
2714	tooltip => $text,	3017	tooltip => $text,
2715	fontsize => 0.8,
2716	color => [0.8, 0.8, 0.8, 0.8],	3018	fg => [0.8, 0.8, 0.8, 0.8],
2717	pri => 0,	3019	pri => 0,
2718	count => 1,	3020	count => 1,
2719	%arg,	3021	%arg,
2720	};	3022	};
2721	}	3023	}
2722		3024
2723	$self->reorder;	3025	$self->reorder;
2724	}	3026	}
2725		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
2726	#############################################################################	3038	#############################################################################
2727		3039
2728	package CFClient::UI::Root;	3040	package CFClient::UI::Root;
2729		3041
2730	our @ISA = CFClient::UI::Container::;	3042	our @ISA = CFClient::UI::Container::;
…		…
2760	}	3072	}
2761		3073
2762	sub size_allocate {	3074	sub size_allocate {
2763	my ($self, $w, $h) = @_;	3075	my ($self, $w, $h) = @_;
2764		3076
2765	my $old_w = $self->{old_w};
2766	my $old_h = $self->{old_h};
2767
2768	if ($old_w && $old_h) {
2769	for my $child ($self->children) {
2770	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778	}
2779	}
2780
2781	for my $child ($self->children) {	3077	for my $child ($self->children) {
2782	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)};
2783		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
2784	$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;
2785	$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
2786	$child->configure ($X, $Y, $W, $H);	3089	$child->configure ($X, $Y, $W, $H);
2787	}	3090	}
2788
2789	$self->{old_w} = $w;
2790	$self->{old_h} = $h;
2791	}	3091	}
2792		3092
2793	sub coord2local {	3093	sub coord2local {
2794	my ($self, $x, $y) = @_;	3094	my ($self, $x, $y) = @_;
2795		3095
…		…
2808	$self->check_size;	3108	$self->check_size;
2809	$::WANT_REFRESH++;	3109	$::WANT_REFRESH++;
2810	}	3110	}
2811		3111
2812	sub add {	3112	sub add {
2813	my ($self, $child) = @_;	3113	my ($self, @children) = @_;
2814		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
		3121	for my $child (@children) {
		3122	$child->{is_toplevel} = 1;
		3123
2815	# integerise window positions	3124	# integerise window positions
2816	$child->{x} = int $child->{x};	3125	$child->{x} = int $child->{x};
2817	$child->{y} = int $child->{y};	3126	$child->{y} = int $child->{y};
		3127	}
2818		3128
2819	$self->SUPER::add ($child);	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	}
2820	}	3142	}
2821		3143
2822	sub on_refresh {	3144	sub on_refresh {
2823	my ($self, $id, $cb) = @_;	3145	my ($self, $id, $cb) = @_;
2824		3146
…		…
2877	$w = 0 if $w < 0;	3199	$w = 0 if $w < 0;
2878	$h = 0 if $h < 0;	3200	$h = 0 if $h < 0;
2879		3201
2880	$widget->{w} = $w;	3202	$widget->{w} = $w;
2881	$widget->{h} = $h;	3203	$widget->{h} = $h;
2882	$widget->size_allocate ($w, $h);
2883	$widget->emit (size_allocate => $w, $h);	3204	$widget->emit (size_allocate => $w, $h);
2884	}	3205	}
2885	}	3206	}
2886		3207
2887	while ($self->{post_alloc_hook}) {	3208	while ($self->{post_alloc_hook}) {
…		…
2893	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3214	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2894	glClear GL_COLOR_BUFFER_BIT;	3215	glClear GL_COLOR_BUFFER_BIT;
2895		3216
2896	glMatrixMode GL_PROJECTION;	3217	glMatrixMode GL_PROJECTION;
2897	glLoadIdentity;	3218	glLoadIdentity;
2898	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3219	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2899	glMatrixMode GL_MODELVIEW;	3220	glMatrixMode GL_MODELVIEW;
2900	glLoadIdentity;	3221	glLoadIdentity;
2901		3222
2902	$self->_draw;	3223	$self->_draw;
2903	}	3224	}
…		…
2905	#############################################################################	3226	#############################################################################
2906		3227
2907	package CFClient::UI;	3228	package CFClient::UI;
2908		3229
2909	$ROOT = new CFClient::UI::Root;	3230	$ROOT = new CFClient::UI::Root;
2910	$TOOLTIP = new CFClient::UI::Tooltip;	3231	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2911		3232
2912	1	3233	1
2913		3234

Diff Legend

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