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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.233 by root, Thu May 25 03:42:40 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
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);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	}	51	}
49		52
50	# class methods for events	53	# class methods for events
51	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	56	if $FOCUS;
54	}	57	}
55		58
56	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	61	if $FOCUS;
59	}	62	}
60		63
61	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	65	my ($ev) = @_;
…		…
71	check_tooltip;	74	check_tooltip;
72	}	75	}
73		76
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		78
76	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79	}
80	}	81	}
81		82
82	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	84	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
85		86
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87		88
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		90
90	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		93
95	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	96	$grab->update if $grab;
98	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
114	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
115		114
116	check_tooltip;	115	check_tooltip;
117	}	116	}
118		117
119	if ($HOVER) {
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122	}	119	if $HOVER;
123	}	120	}
124		121
125	# convert position array to integers	122	# convert position array to integers
126	sub harmonize {	123	sub harmonize {
127	my ($vals) = @_;	124	my ($vals) = @_;
…		…
131	for (@$vals) {	128	for (@$vals) {
132	my $i = int $_ + $rem;	129	my $i = int $_ + $rem;
133	$rem += $_ - $i;	130	$rem += $_ - $i;
134	$_ = $i;	131	$_ = $i;
135	}	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;
136	}	169	}
137		170
138	#############################################################################	171	#############################################################################
139		172
140	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
158	if (/^connect_(.*)$/) {	191	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	192	$self->connect ($1 => delete $self->{$_});
160	}	193	}
161	}	194	}
162		195
		196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		197
163	$self	198	$self
164	}	199	}
165		200
166	sub destroy {	201	sub destroy {
167	my ($self) = @_;	202	my ($self) = @_;
…		…
170	%$self = ();	205	%$self = ();
171	}	206	}
172		207
173	sub show {	208	sub show {
174	my ($self) = @_;	209	my ($self) = @_;
175
176	return if $self->{parent};	210	return if $self->{parent};
177		211
178	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
179	}	213	}
180		214
181	sub hide {	215	sub show_centered {
182	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};
183		234
184	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
185	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;
186		248
187	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
188	if $self->{parent};	250	if $self->{parent};
189	}	251	}
190		252
…		…
240		302
241	sub size_allocate {	303	sub size_allocate {
242	# nothing to be done	304	# nothing to be done
243	}	305	}
244		306
		307	sub reconfigure {
		308	my ($self) = @_;
		309
		310	$self->check_size (1);
		311	$self->update;
		312	}
		313
245	sub children {	314	sub children {
246	}
247
248	# call when resolution changes etc.
249	sub reconfigure {
250	my ($self) = @_;
251
252	$_->reconfigure
253	for $self->children;
254
255	$self->check_size;
256	$self->size_allocate ($self->{w}, $self->{h});
257	$self->update;
258	}	315	}
259		316
260	sub set_max_size {	317	sub set_max_size {
261	my ($self, $w, $h) = @_;	318	my ($self, $w, $h) = @_;
262		319
263	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
264	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	}
265	}	333	}
266		334
267	# translate global coordinates to local coordinate system	335	# translate global coordinates to local coordinate system
268	sub coord2local {	336	sub coord2local {
269	my ($self, $x, $y) = @_;	337	my ($self, $x, $y) = @_;
…		…
284	return if $FOCUS == $self;	352	return if $FOCUS == $self;
285	return unless $self->{can_focus};	353	return unless $self->{can_focus};
286		354
287	my $focus = $FOCUS; $FOCUS = $self;	355	my $focus = $FOCUS; $FOCUS = $self;
288		356
289	$self->emit (focus_in => $focus);	357	$self->_emit (focus_in => $focus);
290		358
291	$focus->update if $focus;	359	$focus->update if $focus;
292	$FOCUS->update;	360	$FOCUS->update;
293	}	361	}
294		362
…		…
297		365
298	return unless $FOCUS == $self;	366	return unless $FOCUS == $self;
299		367
300	my $focus = $FOCUS; undef $FOCUS;	368	my $focus = $FOCUS; undef $FOCUS;
301		369
302	$self->emit (focus_out => $focus);	370	$self->_emit (focus_out => $focus);
303		371
304	$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;
305	}	376	}
306		377
307	sub mouse_motion { }	378	sub mouse_motion { }
308	sub button_up { }	379	sub button_up { }
309	sub key_down { }	380	sub key_down { }
310	sub key_up { }	381	sub key_up { }
311		382
312	sub button_down {	383	sub button_down {
313	my ($self, $ev, $x, $y) = @_;	384	my ($self, $ev, $x, $y) = @_;
314		385
315	$self->focus_in;	386	$self->focus_in;
…		…
355	glVertex $self->{w}, 0;	426	glVertex $self->{w}, 0;
356	glVertex $self->{w}, $self->{h};	427	glVertex $self->{w}, $self->{h};
357	glVertex 0 , $self->{h};	428	glVertex 0 , $self->{h};
358	glEnd;	429	glEnd;
359	glPopMatrix;	430	glPopMatrix;
360	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;
361	}	432	}
362	}	433	}
363		434
364	sub _draw {	435	sub _draw {
365	my ($self) = @_;	436	my ($self) = @_;
…		…
380	}	451	}
381		452
382	sub set_parent {	453	sub set_parent {
383	my ($self, $parent) = @_;	454	my ($self, $parent) = @_;
384		455
385	$self->{_tree_depth} = $parent->{_tree_depth} + 1;
386	Scalar::Util::weaken ($self->{parent} = $parent);	456	Scalar::Util::weaken ($self->{parent} = $parent);
		457
		458	# TODO: req_w _does_change after ->reconfigure
		459	$self->check_size
		460	unless exists $self->{req_w};
		461
		462	$self->show;
387	}	463	}
388		464
389	sub check_size {	465	sub check_size {
390	my ($self) = @_;	466	my ($self, $forced) = @_;
391		467
		468	$self->{force_alloc} = 1 if $forced;
392	$CFClient::UI::ROOT->{check_size}{$self} = $self;	469	$CFClient::UI::ROOT->{check_size}{$self} = $self;
393	}	470	}
394		471
395	sub update {	472	sub update {
396	my ($self) = @_;	473	my ($self) = @_;
…		…
403	my ($self, $signal, $cb) = @_;	480	my ($self, $signal, $cb) = @_;
404		481
405	push @{ $self->{signal_cb}{$signal} }, $cb;	482	push @{ $self->{signal_cb}{$signal} }, $cb;
406	}	483	}
407		484
		485	sub _emit {
		486	my ($self, $signal, @args) = @_;
		487
		488	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		489	}
		490
408	sub emit {	491	sub emit {
409	my ($self, $signal, @args) = @_;	492	my ($self, $signal, @args) = @_;
410		493
411	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	494	$self->_emit ($signal, @args)
		495	|| $self->$signal (@args);
412	}	496	}
413		497
414	sub DESTROY {	498	sub DESTROY {
415	my ($self) = @_;	499	my ($self) = @_;
416		500
		501	delete $WIDGET{$self+0};
417	#$self->deactivate;	502	#$self->deactivate;
418	}	503	}
419		504
420	#############################################################################	505	#############################################################################
421		506
…		…
430	my $class = shift;	515	my $class = shift;
431		516
432	# range [value, low, high, page]	517	# range [value, low, high, page]
433		518
434	$class->SUPER::new (	519	$class->SUPER::new (
435	bg => [0, 0, 0, 0.2],	520	#bg => [0, 0, 0, 0.2],
436	active_bg => [1, 1, 1, 0.5],	521	#active_bg => [1, 1, 1, 0.5],
437	@_	522	@_
438	)	523	)
439	}	524	}
440		525
441	sub _draw {	526	sub _draw {
442	my ($self) = @_;	527	my ($self) = @_;
443		528
		529	my $color = $FOCUS == $self && $self->{active_bg}
		530	? $self->{active_bg}
		531	: $self->{bg};
		532
		533	if ($color && (@$color < 4 || $color->[3])) {
444	my ($w, $h) = @$self{qw(w h)};	534	my ($w, $h) = @$self{qw(w h)};
445		535
446	glEnable GL_BLEND;	536	glEnable GL_BLEND;
447	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	537	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	538	glColor @$color;
449		539
450	glBegin GL_QUADS;	540	glBegin GL_QUADS;
451	glVertex 0 , 0;	541	glVertex 0 , 0;
452	glVertex 0 , $h;	542	glVertex 0 , $h;
453	glVertex $w, $h;	543	glVertex $w, $h;
454	glVertex $w, 0;	544	glVertex $w, 0;
455	glEnd;	545	glEnd;
456		546
457	glDisable GL_BLEND;	547	glDisable GL_BLEND;
		548	}
458	}	549	}
459		550
460	#############################################################################	551	#############################################################################
461		552
462	package CFClient::UI::Empty;	553	package CFClient::UI::Empty;
…		…
506	$self->{children} = [	597	$self->{children} = [
507	sort { $a->{z} <=> $b->{z} }	598	sort { $a->{z} <=> $b->{z} }
508	@{$self->{children}}, @widgets	599	@{$self->{children}}, @widgets
509	];	600	];
510		601
511	$_->check_size	602	$self->check_size (1);
512	for @widgets;
513
514	$self->update;	603	$self->update;
515	}	604	}
516		605
517	sub children {	606	sub children {
518	@{ $_[0]{children} }	607	@{ $_[0]{children} }
…		…
625	}	714	}
626		715
627	sub update {	716	sub update {
628	my ($self) = @_;	717	my ($self) = @_;
629		718
630	$ROOT->on_refresh ($self => sub { $self->render_child });	719	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	720	$self->SUPER::update;
632	}	721	}
633		722
634	sub size_allocate {	723	sub size_allocate {
635	my ($self, $w, $h) = @_;	724	my ($self, $w, $h) = @_;
…		…
648	$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 {
649	glClearColor 0, 0, 0, 0;	738	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	739	glClear GL_COLOR_BUFFER_BIT;
651		740
652	$self->_render;	741	$self->_render;
653	# glColorMask 1, 1, 1, 0;
654	# glEnable GL_BLEND;
655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656	# glRasterPos 0, 0;
657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
658	# glDisable GL_BLEND;
659	# glColorMask 1, 1, 1, 1;
660	};	742	};
661	}	743	}
662		744
663	sub _draw {	745	sub _draw {
664	my ($self) = @_;	746	my ($self) = @_;
…		…
666	my ($w, $h) = ($self->w, $self->h);	748	my ($w, $h) = ($self->w, $self->h);
667		749
668	my $tex = $self->{texture}	750	my $tex = $self->{texture}
669	or return;	751	or return;
670		752
671	glEnable GL_BLEND;
672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	753	glEnable GL_TEXTURE_2D;
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	754	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675	glColor 0, 0, 0, 1;	755	glColor 1, 1, 1, 1;
676		756
677	$tex->draw_quad (0, 0, $w, $h);	757	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678		758
679	glDisable GL_BLEND;
680	glDisable GL_TEXTURE_2D;	759	glDisable GL_TEXTURE_2D;
681	}	760	}
682		761
683	#############################################################################	762	#############################################################################
684		763
…		…
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});
…		…
776	$self->add ($self->{slider});	857	$self->add ($self->{slider});
777		858
778	$self	859	$self
779	}	860	}
780		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]);
		869	}
		870
781	#TODO# update range on size_allocate depeneing 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
784	#############################################################################	874	#############################################################################
785		875
786	package CFClient::UI::Frame;	876	package CFClient::UI::Frame;
…		…
790	use CFClient::OpenGL;	880	use CFClient::OpenGL;
791		881
792	sub new {	882	sub new {
793	my $class = shift;	883	my $class = shift;
794		884
795	my $self = $class->SUPER::new (	885	$class->SUPER::new (
796	bg => [1, 1, 1, 1],	886	bg => undef,
797	border_bg => [1, 1, 1, 1],
798	border => 0.8,
799	@_	887	@_,
800	);	888	)
801
802	$self
803	}	889	}
804		890
805	sub _draw {	891	sub _draw {
806	my ($self) = @_;	892	my ($self) = @_;
807		893
808	my ($w, $h) = ($self->{w}, $self->{h});	894	if ($self->{bg}) {
		895	my ($w, $h) = @$self{qw(w h)};
809		896
810	glEnable GL_BLEND;	897	glEnable GL_BLEND;
811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	898	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812	glEnable GL_TEXTURE_2D;	899	glColor @{ $self->{bg} };
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814		900
815	# glBegin GL_QUADS;	901	glBegin GL_QUADS;
816	# glColor 0, 0, 0, 0;
817	# glVertex 0 , 0;	902	glVertex 0 , 0;
818	# glVertex 0 , $h;	903	glVertex 0 , $h;
819	# glVertex $w, $h;	904	glVertex $w, $h;
820	# glVertex $w, 0;	905	glVertex $w, 0;
821	# glEnd;	906	glEnd;
822		907
823
824	$self->child->draw;
825	glDisable GL_BLEND;	908	glDisable GL_BLEND;
826	glDisable GL_TEXTURE_2D;	909	}
		910
		911	$self->SUPER::_draw;
827	}	912	}
828		913
829	#############################################################################	914	#############################################################################
830		915
831	package CFClient::UI::FancyFrame;	916	package CFClient::UI::FancyFrame;
…		…
842	my $class = shift;	927	my $class = shift;
843		928
844	# TODO: user_x, user_y, overwrite moveto?	929	# TODO: user_x, user_y, overwrite moveto?
845		930
846	my $self = $class->SUPER::new (	931	my $self = $class->SUPER::new (
847	bg => [1, 1, 1, 1],	932	bg => [1, 1, 1, 1],
848	border_bg => [1, 1, 1, 1],	933	border_bg => [1, 1, 1, 1],
849	border => 0.6,	934	border => 0.6,
		935	is_toplevel => 1,
850	can_events => 1,	936	can_events => 1,
851	@_	937	@_
852	);	938	);
853		939
854	$self->{title} &&= new CFClient::UI::Label	940	$self->{title} &&= new CFClient::UI::Label
855	align => 0,	941	align => 0,
…		…
879	my ($self, $w, $h) = @_;	965	my ($self, $w, $h) = @_;
880		966
881	$h -= List::Util::max 0, $self->border * 2;	967	$h -= List::Util::max 0, $self->border * 2;
882	$w -= List::Util::max 0, $self->border * 2;	968	$w -= List::Util::max 0, $self->border * 2;
883		969
884	$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)
885	if $self->{title};	971	if $self->{title};
886		972
887	$self->child->configure ($self->border, $self->border, $w, $h);	973	$self->child->configure ($self->border, $self->border, $w, $h);
888	}	974	}
889		975
…		…
947	my ($self) = @_;	1033	my ($self) = @_;
948		1034
949	my ($w, $h ) = ($self->{w}, $self->{h});	1035	my ($w, $h ) = ($self->{w}, $self->{h});
950	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1036	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951		1037
952	glEnable GL_BLEND;
953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954	glEnable GL_TEXTURE_2D;	1038	glEnable GL_TEXTURE_2D;
955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1039	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956		1040
957	my $border = $self->border;	1041	my $border = $self->border;
958		1042
959	glColor @{ $self->{border_bg} };	1043	glColor @{ $self->{border_bg} };
960	$tex[1]->draw_quad (0, 0, $w, $border);	1044	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
961	$tex[3]->draw_quad (0, $border, $border, $ch);	1045	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1046	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1047	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964		1048
965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1049	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966	my $bg = $tex[0];	1050	my $bg = $tex[0];
967		1051
968	# TODO: repeat texture not scale	1052	# TODO: repeat texture not scale
…		…
972	glColor @{ $self->{bg} };	1056	glColor @{ $self->{bg} };
973		1057
974	$bg->{s} = $rep_x;	1058	$bg->{s} = $rep_x;
975	$bg->{t} = $rep_y;	1059	$bg->{t} = $rep_y;
976	$bg->{wrap_mode} = 1;	1060	$bg->{wrap_mode} = 1;
977	$bg->draw_quad ($border, $border, $cw, $ch);	1061	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1062	}
978		1063
979	glDisable GL_TEXTURE_2D;	1064	glDisable GL_TEXTURE_2D;
980	glDisable GL_BLEND;
981	}
982		1065
983	$self->{title}->draw if $self->{title};	1066	$self->{title}->draw if $self->{title};
984		1067
985	$self->child->draw;	1068	$self->child->draw;
986	}	1069	}
…		…
1213	}	1296	}
1214		1297
1215	sub size_allocate {	1298	sub size_allocate {
1216	my ($self, $w, $h) = @_;	1299	my ($self, $w, $h) = @_;
1217		1300
		1301	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1302
1218	my $children = $self->{children};	1303	my $children = $self->{children};
1219		1304
1220	my @h = map $_->{req_h}, @$children;	1305	my @h = map $_->{req_h}, @$children;
1221		1306
1222	my $req_h = List::Util::sum @h;	1307	my $req_h = List::Util::sum @h;
…		…
1251		1336
1252	#############################################################################	1337	#############################################################################
1253		1338
1254	package CFClient::UI::Label;	1339	package CFClient::UI::Label;
1255		1340
1256	our @ISA = CFClient::UI::Base::;	1341	our @ISA = CFClient::UI::DrawBG::;
1257		1342
1258	use CFClient::OpenGL;	1343	use CFClient::OpenGL;
1259		1344
1260	sub new {	1345	sub new {
1261	my ($class, %arg) = @_;	1346	my ($class, %arg) = @_;
1262		1347
1263	my $self = $class->SUPER::new (	1348	my $self = $class->SUPER::new (
1264	fg => [1, 1, 1],	1349	fg => [1, 1, 1],
		1350	#bg => none
		1351	#active_bg => none
1265	#font => default_font	1352	#font => default_font
		1353	#text => initial text
		1354	#markup => initial narkup
		1355	#max_w => maximum pixel width
		1356	ellipsise => 3, # end
		1357	layout => (new CFClient::Layout),
1266	fontsize => 1,	1358	fontsize => 1,
1267	text => "",
1268	align => -1,	1359	align => -1,
1269	valign => -1,	1360	valign => -1,
1270	padding => 2,	1361	padding => 2,
1271	layout => new CFClient::Layout,
1272	can_events => 0,	1362	can_events => 0,
1273	%arg	1363	%arg
1274	);	1364	);
1275		1365
1276	if (exists $self->{template}) {	1366	if (exists $self->{template}) {
1277	my $layout = new CFClient::Layout;	1367	my $layout = new CFClient::Layout;
1278	$layout->set_text (delete $self->{template});	1368	$layout->set_text (delete $self->{template});
1279	$self->{template} = $layout;	1369	$self->{template} = $layout;
1280	}	1370	}
1281		1371
1282	$self->set_text (delete $self->{text}) if exists $self->{text};	1372	if (exists $self->{markup}) {
1283	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1373	$self->set_markup (delete $self->{markup});
		1374	} else {
		1375	$self->set_text (delete $self->{text});
		1376	}
1284		1377
1285	$self	1378	$self
1286	}	1379	}
1287		1380
1288	sub escape {	1381	sub escape($) {
1289	local $_ = $_[1];	1382	local $_ = $_[0];
1290		1383
1291	s/&/&amp;/g;	1384	s/&/&amp;/g;
1292	s/>/&gt;/g;	1385	s/>/&gt;/g;
1293	s/</&lt;/g;	1386	s/</&lt;/g;
1294		1387
1295	$_[1]	1388	$_
1296	}	1389	}
1297		1390
1298	sub update {	1391	sub update {
1299	my ($self) = @_;	1392	my ($self) = @_;
1300		1393
…		…
1306	my ($self, $text) = @_;	1399	my ($self, $text) = @_;
1307		1400
1308	return if $self->{text} eq "T$text";	1401	return if $self->{text} eq "T$text";
1309	$self->{text} = "T$text";	1402	$self->{text} = "T$text";
1310		1403
		1404	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311	$self->{layout}->set_text ($text);	1405	$self->{layout}->set_text ($text);
1312		1406
1313	$self->update;	1407	$self->update;
1314	$self->check_size;	1408	$self->check_size;
1315	}	1409	}
…		…
1318	my ($self, $markup) = @_;	1412	my ($self, $markup) = @_;
1319		1413
1320	return if $self->{text} eq "M$markup";	1414	return if $self->{text} eq "M$markup";
1321	$self->{text} = "M$markup";	1415	$self->{text} = "M$markup";
1322		1416
		1417	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1418
		1419	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323	$self->{layout}->set_markup ($markup);	1420	$self->{layout}->set_markup ($markup);
1324		1421
1325	$self->update;	1422	$self->update;
1326	$self->check_size;	1423	$self->check_size;
1327	}	1424	}
…		…
1329	sub size_request {	1426	sub size_request {
1330	my ($self) = @_;	1427	my ($self) = @_;
1331		1428
1332	$self->{layout}->set_font ($self->{font}) if $self->{font};	1429	$self->{layout}->set_font ($self->{font}) if $self->{font};
1333	$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});
1334	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1433	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335		1434
1336	my ($w, $h) = $self->{layout}->size;	1435	my ($w, $h) = $self->{layout}->size;
1337		1436
1338	if (exists $self->{template}) {	1437	if (exists $self->{template}) {
…		…
1368	}	1467	}
1369		1468
1370	sub _draw {	1469	sub _draw {
1371	my ($self) = @_;	1470	my ($self) = @_;
1372		1471
		1472	$self->SUPER::_draw; # draw background, if applicable
		1473
1373	my $tex = $self->{texture} ||= do {	1474	my $tex = $self->{texture} ||= do {
		1475	$self->{layout}->set_foreground (@{$self->{fg}});
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1476	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$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});
1376	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1480	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1481
1377	new_from_layout CFClient::Texture $self->{layout}	1482	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1483
		1484	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1485	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1486	: ($self->{w} - $tex->{w}) * 0.5);
		1487
		1488	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1489	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1490	: ($self->{h} - $tex->{h}) * 0.5);
		1491
		1492	$tex
1378	};	1493	};
1379		1494
1380	glEnable GL_BLEND;
1381	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382	glEnable GL_TEXTURE_2D;	1495	glEnable GL_TEXTURE_2D;
1383	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384		1497
		1498	if ($tex->{format} == GL_ALPHA) {
1385	glColor @{$self->{fg}};	1499	glColor @{$self->{fg}};
1386
1387	$self->{ox} = int (
1388	$self->{align} < 0 ? $self->{padding}
1389	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390	: ($self->{w} - $tex->{w}) * 0.5
1391	);
1392
1393	$self->{oy} = int (
1394	$self->{valign} < 0 ? $self->{padding}
1395	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1396	: ($self->{h} - $tex->{h}) * 0.5
1397	);
1398
1399	$tex->draw_quad ($self->{ox}, $self->{oy});	1500	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1501	} else {
		1502	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1503	}
1400		1504
1401	glDisable GL_TEXTURE_2D;	1505	glDisable GL_TEXTURE_2D;
1402	glDisable GL_BLEND;
1403	}	1506	}
1404		1507
1405	#############################################################################	1508	#############################################################################
1406		1509
1407	package CFClient::UI::EntryBase;	1510	package CFClient::UI::EntryBase;
…		…
1420	active_fg => [0, 0, 0],	1523	active_fg => [0, 0, 0],
1421	can_hover => 1,	1524	can_hover => 1,
1422	can_focus => 1,	1525	can_focus => 1,
1423	valign => 0,	1526	valign => 0,
1424	can_events => 1,	1527	can_events => 1,
		1528	#text => ...
1425	@_	1529	@_
1426	)	1530	)
1427	}	1531	}
1428		1532
1429	sub _set_text {	1533	sub _set_text {
…		…
1439	$self->{text} = $text;	1543	$self->{text} = $text;
1440		1544
1441	$text =~ s/./*/g if $self->{hidden};	1545	$text =~ s/./*/g if $self->{hidden};
1442	$self->{layout}->set_text ("$text ");	1546	$self->{layout}->set_text ("$text ");
1443		1547
1444	$self->emit (changed => $self->{text});	1548	$self->_emit (changed => $self->{text});
1445	}
1446
1447	sub get_text {
1448	$_[0]{text}
1449	}
1450
1451	sub size_request {
1452	my ($self) = @_;
1453
1454	my ($w, $h) = $self->SUPER::size_request;
1455
1456	($w + 1, $h) # add 1 for cursor
1457	}
1458
1459	sub size_allocate {
1460	my ($self, $w, $h) = @_;
1461
1462	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1463	}	1549	}
1464		1550
1465	sub set_text {	1551	sub set_text {
1466	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1467		1553
1468	$self->{cursor} = length $text;	1554	$self->{cursor} = length $text;
1469	$self->_set_text ($text);	1555	$self->_set_text ($text);
1470	$self->update;	1556	$self->update;
		1557	$self->check_size;
		1558	}
		1559
		1560	sub get_text {
		1561	$_[0]{text}
		1562	}
		1563
		1564	sub size_request {
		1565	my ($self) = @_;
		1566
		1567	my ($w, $h) = $self->SUPER::size_request;
		1568
		1569	($w + 1, $h) # add 1 for cursor
1471	}	1570	}
1472		1571
1473	sub key_down {	1572	sub key_down {
1474	my ($self, $ev) = @_;	1573	my ($self, $ev) = @_;
1475		1574
…		…
1477	my $sym = $ev->{sym};	1576	my $sym = $ev->{sym};
1478	my $uni = $ev->{unicode};	1577	my $uni = $ev->{unicode};
1479		1578
1480	my $text = $self->get_text;	1579	my $text = $self->get_text;
1481		1580
1482	if ($sym == 8) {	1581	if ($uni == 8) {
1483	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1582	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484	} elsif ($sym == 127) {	1583	} elsif ($uni == 127) {
1485	substr $text, $self->{cursor}, 1, "";	1584	substr $text, $self->{cursor}, 1, "";
1486	} elsif ($sym == CFClient::SDLK_LEFT) {	1585	} elsif ($sym == CFClient::SDLK_LEFT) {
1487	--$self->{cursor} if $self->{cursor};	1586	--$self->{cursor} if $self->{cursor};
1488	} elsif ($sym == CFClient::SDLK_RIGHT) {	1587	} elsif ($sym == CFClient::SDLK_RIGHT) {
1489	++$self->{cursor} if $self->{cursor} < length $self->{text};	1588	++$self->{cursor} if $self->{cursor} < length $self->{text};
1490	} elsif ($sym == CFClient::SDLK_HOME) {	1589	} elsif ($sym == CFClient::SDLK_HOME) {
1491	$self->{cursor} = 0;	1590	$self->{cursor} = 0;
1492	} elsif ($sym == CFClient::SDLK_END) {	1591	} elsif ($sym == CFClient::SDLK_END) {
1493	$self->{cursor} = length $text;	1592	$self->{cursor} = length $text;
1494	} elsif ($sym == 27) {	1593	} elsif ($uni == 27) {
1495	$self->emit ('escape');	1594	$self->_emit ('escape');
1496	} elsif ($uni) {	1595	} elsif ($uni) {
1497	substr $text, $self->{cursor}++, 0, chr $uni;	1596	substr $text, $self->{cursor}++, 0, chr $uni;
1498	}	1597	}
1499		1598
1500	$self->_set_text ($text);	1599	$self->_set_text ($text);
1501	$self->update;	1600	$self->update;
		1601	$self->check_size;
1502	}	1602	}
1503		1603
1504	sub focus_in {	1604	sub focus_in {
1505	my ($self) = @_;	1605	my ($self) = @_;
1506		1606
…		…
1586	if ($sym == 13) {	1686	if ($sym == 13) {
1587	unshift @{$self->{history}},	1687	unshift @{$self->{history}},
1588	my $txt = $self->get_text;	1688	my $txt = $self->get_text;
1589	$self->{history_pointer} = -1;	1689	$self->{history_pointer} = -1;
1590	$self->{history_saveback} = '';	1690	$self->{history_saveback} = '';
1591	$self->emit (activate => $txt);	1691	$self->_emit (activate => $txt);
1592	$self->update;	1692	$self->update;
1593		1693
1594	} elsif ($sym == CFClient::SDLK_UP) {	1694	} elsif ($sym == CFClient::SDLK_UP) {
1595	if ($self->{history_pointer} < 0) {	1695	if ($self->{history_pointer} < 0) {
1596	$self->{history_saveback} = $self->get_text;	1696	$self->{history_saveback} = $self->get_text;
…		…
1635	my $class = shift;	1735	my $class = shift;
1636		1736
1637	$class->SUPER::new (	1737	$class->SUPER::new (
1638	padding => 4,	1738	padding => 4,
1639	fg => [1, 1, 1],	1739	fg => [1, 1, 1],
1640	bg => [1, 1, 1, 0.2],
1641	active_fg => [0, 0, 1],	1740	active_fg => [0, 0, 1],
1642	can_hover => 1,	1741	can_hover => 1,
1643	align => 0,	1742	align => 0,
1644	valign => 0,	1743	valign => 0,
1645	can_events => 1,	1744	can_events => 1,
1646	@_	1745	@_
1647	)	1746	)
1648	}	1747	}
1649		1748
		1749	sub activate { }
		1750
1650	sub button_up {	1751	sub button_up {
1651	my ($self, $ev, $x, $y) = @_;	1752	my ($self, $ev, $x, $y) = @_;
1652		1753
		1754	$self->emit ("activate")
1653	if ($x >= 0 && $x < $self->{w}	1755	if $x >= 0 && $x < $self->{w}
1654	&& $y >= 0 && $y < $self->{h}) {	1756	&& $y >= 0 && $y < $self->{h};
1655	$self->emit ("activate");
1656	}
1657	}	1757	}
1658		1758
1659	sub _draw {	1759	sub _draw {
1660	my ($self) = @_;	1760	my ($self) = @_;
1661		1761
…		…
1663		1763
1664	if ($GRAB == $self) {	1764	if ($GRAB == $self) {
1665	$self->{fg} = $self->{active_fg};	1765	$self->{fg} = $self->{active_fg};
1666	}	1766	}
1667		1767
1668	glEnable GL_BLEND;
1669	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670	glEnable GL_TEXTURE_2D;	1768	glEnable GL_TEXTURE_2D;
1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1769	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672	glColor 0, 0, 0, 1;	1770	glColor 0, 0, 0, 1;
1673		1771
1674	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1772	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675		1773
1676	glDisable GL_TEXTURE_2D;	1774	glDisable GL_TEXTURE_2D;
1677	glDisable GL_BLEND;
1678		1775
1679	$self->SUPER::_draw;	1776	$self->SUPER::_draw;
1680	}	1777	}
1681		1778
1682	#############################################################################	1779	#############################################################################
…		…
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) = @_;
…		…
1729		1828
1730	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1829	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731		1830
1732	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1831	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733		1832
1734	glEnable GL_BLEND;	1833	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1834
1735	glEnable GL_TEXTURE_2D;	1835	glEnable GL_TEXTURE_2D;
1736	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737
1738	my $tex = $self->{state} ? $tex[1] : $tex[0];
1739
1740	$tex->draw_quad (0, 0, $s, $s);	1836	$tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742	glDisable GL_TEXTURE_2D;	1837	glDisable GL_TEXTURE_2D;
1743	glDisable GL_BLEND;
1744	}	1838	}
1745		1839
1746	#############################################################################	1840	#############################################################################
1747		1841
1748	package CFClient::UI::Image;	1842	package CFClient::UI::Image;
…		…
1791	glTranslate 0, -$self->{w}, 0;	1885	glTranslate 0, -$self->{w}, 0;
1792		1886
1793	($w, $h) = ($h, $w);	1887	($w, $h) = ($h, $w);
1794	}	1888	}
1795		1889
1796	glEnable GL_BLEND;
1797	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798	glEnable GL_TEXTURE_2D;	1890	glEnable GL_TEXTURE_2D;
1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1891	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800		1892
1801	$tex->draw_quad (0, 0, $w, $h);	1893	$tex->draw_quad_alpha (0, 0, $w, $h);
1802		1894
1803	glDisable GL_BLEND;
1804	glDisable GL_TEXTURE_2D;	1895	glDisable GL_TEXTURE_2D;
1805	}	1896	}
1806		1897
1807	#############################################################################	1898	#############################################################################
1808		1899
…		…
1997	qw(s1_slider.png s1_slider_bg.png);	2088	qw(s1_slider.png s1_slider_bg.png);
1998		2089
1999	sub new {	2090	sub new {
2000	my $class = shift;	2091	my $class = shift;
2001		2092
2002	# range [value, low, high, page]	2093	# range [value, low, high, page, unit]
2003		2094
2004	# TODO: 0-width page	2095	# TODO: 0-width page
2005	# TODO: req_w/h are wrong with vertical	2096	# TODO: req_w/h are wrong with vertical
2006	# TODO: calculations are off	2097	# TODO: calculations are off
2007	my $self = $class->SUPER::new (	2098	my $self = $class->SUPER::new (
2008	fg => [1, 1, 1],	2099	fg => [1, 1, 1],
2009	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],
2010	range => [0, 0, 100, 10],	2103	range => [0, 0, 100, 10, 0],
2011	req_w => $::WIDTH / 80,	2104	req_w => $::WIDTH / 80,
2012	req_h => $::WIDTH / 80,	2105	req_h => $::WIDTH / 80,
2013	vertical => 0,	2106	vertical => 0,
2014	can_hover => 1,	2107	can_hover => 1,
2015	inner_pad => 5,	2108	inner_pad => 0.02,
2016	@_	2109	@_
2017	);	2110	);
2018		2111
		2112	$self->set_value ($self->{range}[0]);
		2113	$self->update;
		2114
2019	$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	}
2020	}	2147	}
2021		2148
2022	sub size_request {	2149	sub size_request {
2023	my ($self) = @_;	2150	my ($self) = @_;
2024		2151
…		…
2030		2157
2031	sub button_down {	2158	sub button_down {
2032	my ($self, $ev, $x, $y) = @_;	2159	my ($self, $ev, $x, $y) = @_;
2033		2160
2034	$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
2035	$self->mouse_motion ($ev, $x, $y);	2165	$self->mouse_motion ($ev, $x, $y);
2036	}	2166	}
2037		2167
2038	sub mouse_motion {	2168	sub mouse_motion {
2039	my ($self, $ev, $x, $y) = @_;	2169	my ($self, $ev, $x, $y) = @_;
2040		2170
2041	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
2042	my ($value, $lo, $hi, $page) = @{$self->{range}};	2188	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2189	my $range = ($hi - $page - $lo) || 1e-100;
2043		2190
2044	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2191	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045		2192
2046	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2193	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2194	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048		2195
2049	$x -= $inner_pad_px; # substract the padding	2196	$value = ($value - $lo) / $range;
2050	$x = $x * ($hi - $lo) / $inner_w + $lo;	2197	$value = $value * $self->{scale} + $self->{offset};
2051	$x = $lo if $x < $lo;
2052	$x = $hi - $page if $x > $hi - $page;
2053	$self->{range}[0] = $x;
2054		2198
2055	$self->emit (changed => $x);	2199	$self->{knob_x} = $value - $knob_w * 0.5;
2056	$self->update;	2200	$self->{knob_w} = $knob_w;
2057	}	2201	});
2058	}
2059		2202
2060	# the inner_* stuff is for generating a padding for the slider handle,	2203	$self->SUPER::update;
2061	# so that the handle doesn't leave the texture. This calculation isn't 100%
2062	# correct propably, but it does the job for now
2063	sub _calc_inner_pad_px {
2064	my ($self, $w) = @_;
2065	($w / 100) * $self->{inner_pad} # % to pixels
2066	}	2204	}
2067		2205
2068	sub _draw {	2206	sub _draw {
2069	my ($self) = @_;	2207	my ($self) = @_;
2070		2208
2071	$self->SUPER::_draw ();	2209	$self->SUPER::_draw ();
2072		2210
2073	my ($w, $h) = @$self{qw(w h)};	2211	glScale $self->{w}, $self->{h};
2074		2212
2075	if ($self->{vertical}) {	2213	if ($self->{vertical}) {
2076	# draw a vertical slider like a rotated horizontal slider	2214	# draw a vertical slider like a rotated horizontal slider
2077		2215
		2216	glTranslate 1, 0, 0;
2078	glRotate 90, 0, 0, 1;	2217	glRotate 90, 0, 0, 1;
2079	glTranslate 0, -$self->{w}, 0;
2080
2081	($w, $h) = ($h, $w);
2082	}	2218	}
2083		2219
2084	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2220	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2221	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086		2222
2087	my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089	$hi = $value + 1 if $lo == $hi;
2090
2091	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094	$page = int $page * $inner_w / ($hi - $lo);
2095	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097	$w -= $page;
2098	$page &= ~1;
2099	glTranslate $page * 0.5, 0, 0;
2100	$page ||= 2;
2101
2102	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105	glEnable GL_BLEND;
2106	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2107	glEnable GL_TEXTURE_2D;	2223	glEnable GL_TEXTURE_2D;
2108	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109		2225
2110	# draw background	2226	# draw background
2111	$tex[1]->draw_quad (0, 0, $w, $h);	2227	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112		2228
2113	# draw handle	2229	# draw handle
2114	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2230	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115		2231
2116	glDisable GL_BLEND;
2117	glDisable GL_TEXTURE_2D;	2232	glDisable GL_TEXTURE_2D;
2118	}	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 (@_) }
2119		2275
2120	#############################################################################	2276	#############################################################################
2121		2277
2122	package CFClient::UI::TextView;	2278	package CFClient::UI::TextView;
2123		2279
…		…
2132	fontsize => 1,	2288	fontsize => 1,
2133	can_events => 0,	2289	can_events => 0,
2134	#font => default_font	2290	#font => default_font
2135	@_,	2291	@_,
2136		2292
2137	layout => (new CFClient::Layout),	2293	layout => (new CFClient::Layout 1),
2138	par => [],	2294	par => [],
2139	height => 0,	2295	height => 0,
2140	children => [	2296	children => [
2141	(new CFClient::UI::Empty expand => 1),	2297	(new CFClient::UI::Empty expand => 1),
2142	(new CFClient::UI::Slider vertical => 1),	2298	(new CFClient::UI::Slider vertical => 1),
…		…
2153		2309
2154	$self->{fontsize} = $fontsize;	2310	$self->{fontsize} = $fontsize;
2155	$self->reflow;	2311	$self->reflow;
2156	}	2312	}
2157		2313
2158	sub text_height {
2159	my ($self, $text) = @_;
2160
2161	my $layout = $self->{layout};
2162
2163	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164	$layout->set_width ($self->{children}[0]{w});
2165	$layout->set_text ($text);
2166
2167	($layout->size)[1]
2168	}
2169
2170	sub reflow {
2171	my ($self) = @_;
2172
2173	$self->{need_reflow}++;
2174	$self->update;
2175	}
2176
2177	sub size_allocate {	2314	sub size_allocate {
2178	my ($self, $w, $h) = @_;	2315	my ($self, $w, $h) = @_;
2179		2316
2180	$self->SUPER::size_allocate ($w, $h);	2317	$self->SUPER::size_allocate ($w, $h);
2181		2318
…		…
2184	$self->{layout}->set_width ($self->{children}[0]{w});	2321	$self->{layout}->set_width ($self->{children}[0]{w});
2185		2322
2186	$self->reflow;	2323	$self->reflow;
2187	}	2324	}
2188		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
2189	sub add_paragraph {	2360	sub add_paragraph {
2190	my ($self, $color, $text) = @_;	2361	my ($self, $color, $text, $indent) = @_;
2191		2362
2192	#TODO: intelligently "reformat" paragraph	2363	for my $line (split /\n/, $text) {
2193		2364	my ($w, $h) = $self->text_size ($line);
2194	my $height = $self->text_height ($text);
2195
2196	$self->{height} += $height;	2365	$self->{height} += $h;
		2366	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2367	}
2197		2368
2198	push @{$self->{par}}, [$height, $color, $text];
2199
2200	$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]);
2201	$self->{children}[1]->update;
2202	}	2370	}
2203		2371
2204	sub update {	2372	sub update {
2205	my ($self) = @_;	2373	my ($self) = @_;
2206		2374
…		…
2208		2376
2209	return unless $self->{h} > 0;	2377	return unless $self->{h} > 0;
2210		2378
2211	delete $self->{texture};	2379	delete $self->{texture};
2212		2380
2213	$ROOT->on_refresh ($self, sub {	2381	$ROOT->on_post_alloc ($self, sub {
		2382	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2383
2214	if (delete $self->{need_reflow}) {	2384	if (delete $self->{need_reflow}) {
2215	my $height = 0;	2385	my $height = 0;
2216		2386
2217	$height += $_->[0] = $self->text_height ($_->[2])	2387	my $layout = $self->{layout};
		2388
		2389	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2390
2218	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	}
2219		2402
2220	$self->{height} = $height;	2403	$self->{height} = $height;
2221		2404
2222	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2405	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2223		2406
2224	delete $self->{texture};	2407	delete $self->{texture};
2225	}	2408	}
2226		2409
2227	$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 {
2228	glClearColor 0, 0, 0, 0;	2411	glClearColor 0.5, 0.5, 0.5, 0;
2229	glClear GL_COLOR_BUFFER_BIT;	2412	glClear GL_COLOR_BUFFER_BIT;
2230		2413
		2414	my $top = int $self->{children}[1]{range}[0];
		2415
		2416	my $y0 = $top;
		2417	my $y1 = $top + $H;
		2418
		2419	my $y = 0;
		2420
		2421	my $layout = $self->{layout};
		2422
		2423	$layout->set_font ($self->{font}) if $self->{font};
		2424
2231	glEnable GL_BLEND;	2425	glEnable GL_BLEND;
		2426	#TODO# not correct in windows where rgba is forced off
2232	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2427	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233	glEnable GL_TEXTURE_2D;
2234	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235
2236	my $top = int $self->{children}[1]{range}[0];
2237
2238	my $y0 = $top;
2239	my $y1 = $top + $self->{h};
2240
2241	my $y = 0;
2242
2243	my $layout = $self->{layout};
2244
2245	$layout->set_font ($self->{font}) if $self->{font};
2246		2428
2247	for my $par (@{$self->{par}}) {	2429	for my $par (@{$self->{par}}) {
2248	my $h = $par->[0];	2430	my $h = $par->[1];
2249		2431
2250	if ($y0 < $y + $h && $y < $y1) {	2432	if ($y0 < $y + $h && $y < $y1) {
		2433	$layout->set_foreground (@{ $par->[2] });
		2434	$layout->set_width ($W - $par->[3]);
2251	$layout->set_text ($par->[2]);	2435	$layout->set_markup ($par->[4]);
2252		2436
2253	glColor @{ $par->[1] };	2437	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254	my ($W, $H) = $layout->size;	2438
2255	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2439	glRasterPos $par->[3], $y - $y0;
		2440	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2256	}	2441	}
2257		2442
2258	$y += $h;	2443	$y += $h;
2259	}	2444	}
2260		2445
2261	glDisable GL_TEXTURE_2D;
2262	glDisable GL_BLEND;	2446	glDisable GL_BLEND;
2263	};	2447	};
2264	});	2448	});
2265	}	2449	}
2266		2450
2267	sub _draw {	2451	sub _draw {
2268	my ($self) = @_;	2452	my ($self) = @_;
2269		2453
2270	glEnable GL_BLEND;
2271	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272	glEnable GL_TEXTURE_2D;	2454	glEnable GL_TEXTURE_2D;
2273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2455	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274	glColor 1, 1, 1, 1;	2456	glColor 1, 1, 1, 1;
2275	$self->{texture}->draw_quad (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});
2276	glDisable GL_TEXTURE_2D;	2458	glDisable GL_TEXTURE_2D;
2277	glDisable GL_BLEND;
2278		2459
2279	$self->{children}[1]->draw;	2460	$self->{children}[1]->draw;
2280		2461
2281	}	2462	}
2282		2463
…		…
2350		2531
2351	# TODO: use animation	2532	# TODO: use animation
2352	if ($self->{state} = !$self->{state}) {	2533	if ($self->{state} = !$self->{state}) {
2353	$CFClient::UI::ROOT->add ($self->{other});	2534	$CFClient::UI::ROOT->add ($self->{other});
2354	$self->{other}->move ($self->coord2global (0, $self->{h}));	2535	$self->{other}->move ($self->coord2global (0, $self->{h}));
2355	$self->emit ("open");	2536	$self->_emit ("open");
2356	} else {	2537	} else {
2357	$CFClient::UI::ROOT->remove ($self->{other});	2538	$CFClient::UI::ROOT->remove ($self->{other});
2358	$self->emit ("close");	2539	$self->_emit ("close");
2359	}	2540	}
2360		2541
2361	$self->emit (changed => $self->{state});	2542	$self->_emit (changed => $self->{state});
2362	}	2543	}
2363		2544
2364	#############################################################################	2545	#############################################################################
2365		2546
2366	package CFClient::UI::Tooltip;	2547	package CFClient::UI::Tooltip;
…		…
2376	@_,	2557	@_,
2377	can_events => 0,	2558	can_events => 0,
2378	)	2559	)
2379	}	2560	}
2380		2561
2381	sub set_markup {	2562	sub set_tooltip_from {
2382	my ($self, $text) = @_;	2563	my ($self, $widget) = @_;
2383		2564
2384	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2565	$self->add (new CFClient::UI::Label
2385	$self->{label}->set_markup ($text);	2566	markup => $widget->{tooltip},
2386	$self->add ($self->{label});	2567	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2568	fontsize => 0.8,
		2569	fg => [0, 0, 0, 1],
		2570	ellipsise => 0,
		2571	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2572	);
2387	}	2573	}
2388		2574
2389	sub size_request {	2575	sub size_request {
2390	my ($self) = @_;	2576	my ($self) = @_;
2391
2392	$self->child->set_max_size ($::WIDTH * 0.3);
2393		2577
2394	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2578	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395		2579
2396	($w + 4, $h + 4)	2580	($w + 4, $h + 4)
2397	}	2581	}
…		…
2403	}	2587	}
2404		2588
2405	sub _draw {	2589	sub _draw {
2406	my ($self) = @_;	2590	my ($self) = @_;
2407		2591
2408	glPushMatrix;
2409	glTranslate 0.375, 0.375;	2592	glTranslate 0.375, 0.375;
2410		2593
2411	my ($w, $h) = @$self{qw(w h)};	2594	my ($w, $h) = @$self{qw(w h)};
2412		2595
2413	glColor 1, 0.8, 0.4;	2596	glColor 1, 0.8, 0.4;
…		…
2424	glVertex 0 , $h;	2607	glVertex 0 , $h;
2425	glVertex $w, $h;	2608	glVertex $w, $h;
2426	glVertex $w, 0;	2609	glVertex $w, 0;
2427	glEnd;	2610	glEnd;
2428		2611
2429	glPopMatrix;	2612	glTranslate 2 - 0.375, 2 - 0.375;
2430
2431	glTranslate 2, 2;
2432	$self->SUPER::_draw;	2613	$self->SUPER::_draw;
2433	}	2614	}
2434		2615
2435	#############################################################################	2616	#############################################################################
2436		2617
…		…
2441	use CFClient::OpenGL;	2622	use CFClient::OpenGL;
2442		2623
2443	sub new {	2624	sub new {
2444	my $class = shift;	2625	my $class = shift;
2445		2626
2446	$class->SUPER::new (	2627	my $self = $class->SUPER::new (
2447	aspect => 1,	2628	aspect => 1,
2448	@_,	2629	@_,
2449	)	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
2450	}	2647	}
2451		2648
2452	sub size_request {	2649	sub size_request {
2453	(32, 8)	2650	(32, 8)
2454	}	2651	}
2455		2652
		2653	sub update {
		2654	my ($self) = @_;
		2655
		2656	return unless $self->{visible};
		2657
		2658	$self->SUPER::update;
		2659	}
		2660
2456	sub _draw {	2661	sub _draw {
2457	my ($self) = @_;	2662	my ($self) = @_;
2458		2663
2459	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
2460	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2675	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461		2676
2462	# TODO animation
2463	if ($tex) {	2677	if ($tex) {
2464	glEnable GL_BLEND;
2465	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466	glEnable GL_TEXTURE_2D;	2678	glEnable GL_TEXTURE_2D;
2467	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2679	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468	glColor 1, 1, 1, 1;	2680	glColor 1, 1, 1, 1;
2469	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2681	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470	glDisable GL_TEXTURE_2D;	2682	glDisable GL_TEXTURE_2D;
2471	glDisable GL_BLEND;
2472	}	2683	}
		2684	}
		2685
		2686	sub DESTROY {
		2687	my ($self) = @_;
		2688
		2689	$self->{timer}->cancel
		2690	if $self->{timer};
		2691
		2692	$self->SUPER::DESTROY;
2473	}	2693	}
2474		2694
2475	#############################################################################	2695	#############################################################################
2476		2696
2477	package CFClient::UI::InventoryItem;	2697	package CFClient::UI::InventoryItem;
2478		2698
2479	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	}
2480		2726
2481	sub new {	2727	sub new {
2482	my $class = shift;	2728	my $class = shift;
2483		2729
2484	my %args = @_;	2730	my %args = @_;
2485		2731
2486	my $item = $args{item};	2732	my $item = delete $args{item};
2487		2733
2488	my $desc = $item->{nrof} < 2	2734	my $desc = _item_to_desc ($item);
2489	? $item->{name}
2490	: "$item->{nrof} $item->{name_pl}";
2491
2492		2735
2493	my $self = $class->SUPER::new (	2736	my $self = $class->SUPER::new (
2494	can_hover => 1,	2737	can_hover => 1,
2495	can_events => 1,	2738	can_events => 1,
2496	tooltip => (CFClient::UI::Label->escape ($desc)	2739	tooltip => ((CFClient::UI::Label::escape $desc)
2497	. "\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>"),
2498	connect_button_down => sub {	2741	connect_button_down => sub {
2499	my ($self, $ev, $x, $y) = @_;	2742	my ($self, $ev, $x, $y) = @_;
2500		2743
2501	# 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");
2502	if ($ev->{button} == 1) {	2753	} elsif ($ev->{button} == 1) {
2503	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2754	$::CONN->send ("examine $item->{tag}");
2504	} elsif ($ev->{button} == 2) {	2755	} elsif ($ev->{button} == 2) {
2505	$::CONN->send ("apply $item->{tag}");	2756	$::CONN->send ("apply $item->{tag}");
2506	} elsif ($ev->{button} == 3) {	2757	} elsif ($ev->{button} == 3) {
2507	CFClient::UI::Menu->new (	2758	my @menu_items = (
2508	items => [
2509	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2759	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510	[
2511	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512	sub { $::CONN->send ("lock $item->{tag}") },
2513	],
2514	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2760	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2515	["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}) }],
2516	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2769	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2770	)
2517	],	2771	),
2518	)->popup ($ev);	2772	);
		2773
		2774	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2519	}	2775	}
2520		2776
2521	1	2777	1
2522	},	2778	},
2523	%args	2779	%args
2524	);	2780	);
		2781
		2782
2525	$self->add(new CFClient::UI::Face	2783	$self->add (new CFClient::UI::Face
2526	can_events => 0,	2784	can_events => 0,
2527	face => $item->{face},	2785	face => $item->{face},
2528	anim => $item->{anim},	2786	anim => $item->{anim},
2529	animspeed => $item->{animspeed});	2787	animspeed => $item->{animspeed},
2530	$self->add(new CFClient::UI::Label	2788	);
2531	can_events => 0,	2789
2532	text => $desc);	2790	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2791
		2792	$self->{item} = $item;
		2793
		2794	$self->update_item;
2533		2795
2534	$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);
2535	}	2805	}
2536		2806
2537	#############################################################################	2807	#############################################################################
2538		2808
2539	package CFClient::UI::Inventory;	2809	package CFClient::UI::Inventory;
…		…
2542		2812
2543	sub new {	2813	sub new {
2544	my $class = shift;	2814	my $class = shift;
2545		2815
2546	my $self = $class->SUPER::new (	2816	my $self = $class->SUPER::new (
2547	scrolled => (new CFClient::UI::VBox),	2817	scrolled => (new CFClient::UI::Table),
2548	@_,	2818	@_,
2549	);	2819	);
2550		2820
2551	$self	2821	$self
2552	}	2822	}
…		…
2555	my ($self, $items) = @_;	2825	my ($self, $items) = @_;
2556		2826
2557	$self->{scrolled}->clear;	2827	$self->{scrolled}->clear;
2558	return unless $items;	2828	return unless $items;
2559		2829
2560	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;
2561		2834
2562	$self->{real_items} = \@items;	2835	$self->{real_items} = \@items;
2563		2836
2564	for my $item (@items) {	2837	for my $item (@items) {
2565	my $desc = $item->{nrof} < 2	2838	$item->{item} = $item;
2566	? $item->{name}
2567	: "$item->{nrof} $item->{name_pl}";
2568
2569	$self->{scrolled}->add (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);
2570	}	2848	}
2571		2849
2572	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2850	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573	}	2851	}
2574		2852
…		…
2617		2895
2618	# 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)
2619	sub popup {	2897	sub popup {
2620	my ($self, $ev) = @_;	2898	my ($self, $ev) = @_;
2621		2899
2622	$self->emit ("popdown");	2900	$self->_emit ("popdown");
2623		2901
2624	# maybe save $GRAB? must be careful about events...	2902	# maybe save $GRAB? must be careful about events...
2625	$GRAB = $self;	2903	$GRAB = $self;
2626	$self->{button} = $ev->{button};	2904	$self->{button} = $ev->{button};
2627		2905
…		…
2642		2920
2643	if ($ev->{button} == $self->{button}) {	2921	if ($ev->{button} == $self->{button}) {
2644	undef $GRAB;	2922	undef $GRAB;
2645	$self->hide;	2923	$self->hide;
2646		2924
2647	$self->emit ("popdown");	2925	$self->_emit ("popdown");
2648	$self->{hover}[1]->() if $self->{hover};	2926	$self->{hover}[1]->() if $self->{hover};
2649	}	2927	}
		2928	}
		2929
		2930	#############################################################################
		2931
		2932	package CFClient::UI::Statusbox;
		2933
		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	}
		2944
		2945	sub reorder {
		2946	my ($self) = @_;
		2947	my $NOW = time;
		2948
		2949	while (my ($k, $v) = each %{ $self->{item} }) {
		2950	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2951	}
		2952
		2953	my @widgets;
		2954
		2955	my @items = sort {
		2956	$a->{pri} <=> $b->{pri}
		2957	or $b->{id} <=> $a->{id}
		2958	} values %{ $self->{item} };
		2959
		2960	my $count = 10 + 1;
		2961	for my $item (@items) {
		2962	last unless --$count;
		2963
		2964	push @widgets, $item->{label} ||= do {
		2965	# TODO: doesn't handle markup well (read as: at all)
		2966	my $short = $item->{count} > 1
		2967	? "<b>$item->{count} ×</b> $item->{text}"
		2968	: $item->{text};
		2969
		2970	for ($short) {
		2971	s/^\s+//;
		2972	s/\s+/ /g;
		2973	}
		2974
		2975	new CFClient::UI::Label
		2976	markup => $short,
		2977	tooltip => $item->{tooltip},
		2978	tooltip_font => $::FONT_PROP,
		2979	tooltip_width => 0.67,
		2980	fontsize => $item->{fontsize} || $self->{fontsize},
		2981	max_w => $::WIDTH * 0.44,
		2982	fg => $item->{fg},
		2983	can_events => 1,
		2984	can_hover => 1
		2985	};
		2986	}
		2987
		2988	$self->clear;
		2989	$self->SUPER::add (reverse @widgets);
		2990	}
		2991
		2992	sub add {
		2993	my ($self, $text, %arg) = @_;
		2994
		2995	$text =~ s/^\s+//;
		2996	$text =~ s/\s+$//;
		2997
		2998	return unless $text;
		2999
		3000	my $timeout = time + ((delete $arg{timeout}) || 60);
		3001
		3002	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		3003
		3004	if (my $item = $self->{item}{$group}) {
		3005	if ($item->{text} eq $text) {
		3006	$item->{count}++;
		3007	} else {
		3008	$item->{count} = 1;
		3009	$item->{text} = $item->{tooltip} = $text;
		3010	}
		3011	$item->{id} = ++$self->{id};
		3012	$item->{timeout} = $timeout;
		3013	delete $item->{label};
		3014	} else {
		3015	$self->{item}{$group} = {
		3016	id => ++$self->{id},
		3017	text => $text,
		3018	timeout => $timeout,
		3019	tooltip => $text,
		3020	fg => [0.8, 0.8, 0.8, 0.8],
		3021	pri => 0,
		3022	count => 1,
		3023	%arg,
		3024	};
		3025	}
		3026
		3027	$self->reorder;
		3028	}
		3029
		3030	sub reconfigure {
		3031	my ($self) = @_;
		3032
		3033	delete $_->{label}
		3034	for values %{ $self->{item} || {} };
		3035
		3036	$self->reorder;
		3037	$self->SUPER::reconfigure;
2650	}	3038	}
2651		3039
2652	#############################################################################	3040	#############################################################################
2653		3041
2654	package CFClient::UI::Root;	3042	package CFClient::UI::Root;
…		…
2686	}	3074	}
2687		3075
2688	sub size_allocate {	3076	sub size_allocate {
2689	my ($self, $w, $h) = @_;	3077	my ($self, $w, $h) = @_;
2690		3078
2691	my $old_w = $self->{old_w};
2692	my $old_h = $self->{old_h};
2693
2694	if ($old_w && $old_h) {
2695	for my $child ($self->children) {
2696	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704	}
2705	}
2706
2707	for my $child ($self->children) {	3079	for my $child ($self->children) {
2708	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3080	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709		3081
		3082	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3083	if exists $child->{req_x};
		3084
		3085	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3086	if exists $child->{req_y};
		3087
2710	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3088	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2711	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3089	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3090
2712	$child->configure ($X, $Y, $W, $H);	3091	$child->configure ($X, $Y, $W, $H);
2713	}	3092	}
2714
2715	$self->{old_w} = $w;
2716	$self->{old_h} = $h;
2717	}	3093	}
2718		3094
2719	sub coord2local {	3095	sub coord2local {
2720	my ($self, $x, $y) = @_;	3096	my ($self, $x, $y) = @_;
2721		3097
…		…
2734	$self->check_size;	3110	$self->check_size;
2735	$::WANT_REFRESH++;	3111	$::WANT_REFRESH++;
2736	}	3112	}
2737		3113
2738	sub add {	3114	sub add {
2739	my ($self, $child) = @_;	3115	my ($self, @children) = @_;
2740		3116
		3117	for (my @widgets = @children; my $w = pop @widgets; ) {
		3118	push @widgets, $w->children;
		3119	$w->{root} = $self;
		3120	$w->{visible} = 1;
		3121	}
		3122
		3123	for my $child (@children) {
		3124	$child->{is_toplevel} = 1;
		3125
2741	# integerise window positions	3126	# integerise window positions
2742	$child->{x} = int $child->{x};	3127	$child->{x} = int $child->{x};
2743	$child->{y} = int $child->{y};	3128	$child->{y} = int $child->{y};
		3129	}
2744		3130
2745	$self->SUPER::add ($child);	3131	$self->SUPER::add (@children);
		3132	}
		3133
		3134	sub remove {
		3135	my ($self, @children) = @_;
		3136
		3137	$self->SUPER::remove (@children);
		3138
		3139	while (@children) {
		3140	my $w = pop @children;
		3141	push @children, $w->children;
		3142	$w->set_invisible;
		3143	}
2746	}	3144	}
2747		3145
2748	sub on_refresh {	3146	sub on_refresh {
2749	my ($self, $id, $cb) = @_;	3147	my ($self, $id, $cb) = @_;
2750		3148
2751	$self->{refresh_hook}{$id} = $cb;	3149	$self->{refresh_hook}{$id} = $cb;
2752	}	3150	}
2753		3151
		3152	sub on_post_alloc {
		3153	my ($self, $id, $cb) = @_;
		3154
		3155	$self->{post_alloc_hook}{$id} = $cb;
		3156	}
		3157
2754	sub draw {	3158	sub draw {
2755	my ($self) = @_;	3159	my ($self) = @_;
		3160
		3161	while ($self->{refresh_hook}) {
		3162	$_->()
		3163	for values %{delete $self->{refresh_hook}};
		3164	}
2756		3165
2757	if ($self->{check_size}) {	3166	if ($self->{check_size}) {
2758	my @queue = ([], []);	3167	my @queue = ([], []);
2759		3168
2760	for (;;) {	3169	for (;;) {
…		…
2768		3177
2769	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3178	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770	? @$widget{qw(user_w user_h)}	3179	? @$widget{qw(user_w user_h)}
2771	: $widget->size_request;	3180	: $widget->size_request;
2772		3181
		3182	if (delete $widget->{force_alloc}
2773	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3183	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3184	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3185
2774	$widget->{req_w} = $w;	3186	$widget->{req_w} = $w;
2775	$widget->{req_h} = $h;	3187	$widget->{req_h} = $h;
2776		3188
2777	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3189	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2778		3190
2779	$widget->{parent}->check_size	3191	$widget->{parent}->check_size
2780	if $widget->{parent};	3192	if $widget->{parent};
2781	}	3193	}
2782	}	3194	}
…		…
2784		3196
2785	while ($self->{size_alloc}) {	3197	while ($self->{size_alloc}) {
2786	for (values %{delete $self->{size_alloc}}) {	3198	for (values %{delete $self->{size_alloc}}) {
2787	my ($widget, $w, $h) = @$_;	3199	my ($widget, $w, $h) = @$_;
2788		3200
		3201	$w = 0 if $w < 0;
		3202	$h = 0 if $h < 0;
		3203
2789	$widget->{w} = $w;	3204	$widget->{w} = $w;
2790	$widget->{h} = $h;	3205	$widget->{h} = $h;
2791	$widget->size_allocate ($w, $h);
2792	$widget->emit (size_allocate => $w, $h);	3206	$widget->emit (size_allocate => $w, $h);
2793	}	3207	}
2794	}	3208	}
2795		3209
2796	while ($self->{refresh_hook}) {	3210	while ($self->{post_alloc_hook}) {
2797	$_->()	3211	$_->()
2798	for values %{delete $self->{refresh_hook}};	3212	for values %{delete $self->{post_alloc_hook}};
2799	}	3213	}
2800		3214
2801	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3215	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3216	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803	glClear GL_COLOR_BUFFER_BIT;	3217	glClear GL_COLOR_BUFFER_BIT;
2804		3218
2805	glMatrixMode GL_PROJECTION;	3219	glMatrixMode GL_PROJECTION;
2806	glLoadIdentity;	3220	glLoadIdentity;
2807	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3221	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808	glMatrixMode GL_MODELVIEW;	3222	glMatrixMode GL_MODELVIEW;
2809	glLoadIdentity;	3223	glLoadIdentity;
2810		3224
2811	$self->_draw;	3225	$self->_draw;
2812	}	3226	}
…		…
2814	#############################################################################	3228	#############################################################################
2815		3229
2816	package CFClient::UI;	3230	package CFClient::UI;
2817		3231
2818	$ROOT = new CFClient::UI::Root;	3232	$ROOT = new CFClient::UI::Root;
2819	$TOOLTIP = new CFClient::UI::Tooltip;	3233	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820		3234
2821	1	3235	1
2822		3236

Diff Legend

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