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.234 by root, Thu May 25 16:24:44 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	$tooltip =~ s/^\s+//;
		328	$tooltip =~ s/\s+$//;
		329
		330	return if $self->{tooltip} eq $tooltip;
		331
		332	$self->{tooltip} = $tooltip;
		333
		334	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		335	delete $CFClient::UI::TOOLTIP->{owner};
		336	CFClient::UI::check_tooltip;
		337	}
265	}	338	}
266		339
267	# translate global coordinates to local coordinate system	340	# translate global coordinates to local coordinate system
268	sub coord2local {	341	sub coord2local {
269	my ($self, $x, $y) = @_;	342	my ($self, $x, $y) = @_;
…		…
284	return if $FOCUS == $self;	357	return if $FOCUS == $self;
285	return unless $self->{can_focus};	358	return unless $self->{can_focus};
286		359
287	my $focus = $FOCUS; $FOCUS = $self;	360	my $focus = $FOCUS; $FOCUS = $self;
288		361
289	$self->emit (focus_in => $focus);	362	$self->_emit (focus_in => $focus);
290		363
291	$focus->update if $focus;	364	$focus->update if $focus;
292	$FOCUS->update;	365	$FOCUS->update;
293	}	366	}
294		367
…		…
297		370
298	return unless $FOCUS == $self;	371	return unless $FOCUS == $self;
299		372
300	my $focus = $FOCUS; undef $FOCUS;	373	my $focus = $FOCUS; undef $FOCUS;
301		374
302	$self->emit (focus_out => $focus);	375	$self->_emit (focus_out => $focus);
303		376
304	$focus->update if $focus; #?	377	$focus->update if $focus; #?
		378
		379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		380	unless $FOCUS;
305	}	381	}
306		382
307	sub mouse_motion { }	383	sub mouse_motion { }
308	sub button_up { }	384	sub button_up { }
309	sub key_down { }	385	sub key_down { }
310	sub key_up { }	386	sub key_up { }
311		387
312	sub button_down {	388	sub button_down {
313	my ($self, $ev, $x, $y) = @_;	389	my ($self, $ev, $x, $y) = @_;
314		390
315	$self->focus_in;	391	$self->focus_in;
…		…
349	if ($ENV{PCLIENT_DEBUG}) {	425	if ($ENV{PCLIENT_DEBUG}) {
350	glPushMatrix;	426	glPushMatrix;
351	glColor 1, 1, 0, 1;	427	glColor 1, 1, 0, 1;
352	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353	glBegin GL_LINE_LOOP;	429	glBegin GL_LINE_LOOP;
354	glVertex 0 , 0;	430	glVertex 0 , 0;
355	glVertex $self->{w}, 0;	431	glVertex $self->{w} - 1, 0;
356	glVertex $self->{w}, $self->{h};	432	glVertex $self->{w} - 1, $self->{h} - 1;
357	glVertex 0 , $self->{h};	433	glVertex 0 , $self->{h} - 1;
358	glEnd;	434	glEnd;
359	glPopMatrix;	435	glPopMatrix;
360	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	436	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361	}	437	}
362	}	438	}
363		439
364	sub _draw {	440	sub _draw {
365	my ($self) = @_;	441	my ($self) = @_;
…		…
380	}	456	}
381		457
382	sub set_parent {	458	sub set_parent {
383	my ($self, $parent) = @_;	459	my ($self, $parent) = @_;
384		460
385	$self->{_tree_depth} = $parent->{_tree_depth} + 1;
386	Scalar::Util::weaken ($self->{parent} = $parent);	461	Scalar::Util::weaken ($self->{parent} = $parent);
		462
		463	# TODO: req_w _does_change after ->reconfigure
		464	$self->check_size
		465	unless exists $self->{req_w};
		466
		467	$self->show;
387	}	468	}
388		469
389	sub check_size {	470	sub check_size {
390	my ($self) = @_;	471	my ($self, $forced) = @_;
391		472
		473	$self->{force_alloc} = 1 if $forced;
392	$CFClient::UI::ROOT->{check_size}{$self} = $self;	474	$CFClient::UI::ROOT->{check_size}{$self} = $self;
393	}	475	}
394		476
395	sub update {	477	sub update {
396	my ($self) = @_;	478	my ($self) = @_;
…		…
403	my ($self, $signal, $cb) = @_;	485	my ($self, $signal, $cb) = @_;
404		486
405	push @{ $self->{signal_cb}{$signal} }, $cb;	487	push @{ $self->{signal_cb}{$signal} }, $cb;
406	}	488	}
407		489
		490	sub _emit {
		491	my ($self, $signal, @args) = @_;
		492
		493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		494	}
		495
408	sub emit {	496	sub emit {
409	my ($self, $signal, @args) = @_;	497	my ($self, $signal, @args) = @_;
410		498
411	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	499	$self->_emit ($signal, @args)
		500	|| $self->$signal (@args);
412	}	501	}
413		502
414	sub DESTROY {	503	sub DESTROY {
415	my ($self) = @_;	504	my ($self) = @_;
416		505
		506	delete $WIDGET{$self+0};
417	#$self->deactivate;	507	#$self->deactivate;
418	}	508	}
419		509
420	#############################################################################	510	#############################################################################
421		511
…		…
430	my $class = shift;	520	my $class = shift;
431		521
432	# range [value, low, high, page]	522	# range [value, low, high, page]
433		523
434	$class->SUPER::new (	524	$class->SUPER::new (
435	bg => [0, 0, 0, 0.2],	525	#bg => [0, 0, 0, 0.2],
436	active_bg => [1, 1, 1, 0.5],	526	#active_bg => [1, 1, 1, 0.5],
437	@_	527	@_
438	)	528	)
439	}	529	}
440		530
441	sub _draw {	531	sub _draw {
442	my ($self) = @_;	532	my ($self) = @_;
443		533
		534	my $color = $FOCUS == $self && $self->{active_bg}
		535	? $self->{active_bg}
		536	: $self->{bg};
		537
		538	if ($color && (@$color < 4 || $color->[3])) {
444	my ($w, $h) = @$self{qw(w h)};	539	my ($w, $h) = @$self{qw(w h)};
445		540
446	glEnable GL_BLEND;	541	glEnable GL_BLEND;
447	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	542	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	543	glColor @$color;
449		544
450	glBegin GL_QUADS;	545	glBegin GL_QUADS;
451	glVertex 0 , 0;	546	glVertex 0 , 0;
452	glVertex 0 , $h;	547	glVertex 0 , $h;
453	glVertex $w, $h;	548	glVertex $w, $h;
454	glVertex $w, 0;	549	glVertex $w, 0;
455	glEnd;	550	glEnd;
456		551
457	glDisable GL_BLEND;	552	glDisable GL_BLEND;
		553	}
458	}	554	}
459		555
460	#############################################################################	556	#############################################################################
461		557
462	package CFClient::UI::Empty;	558	package CFClient::UI::Empty;
…		…
506	$self->{children} = [	602	$self->{children} = [
507	sort { $a->{z} <=> $b->{z} }	603	sort { $a->{z} <=> $b->{z} }
508	@{$self->{children}}, @widgets	604	@{$self->{children}}, @widgets
509	];	605	];
510		606
511	$_->check_size	607	$self->check_size (1);
512	for @widgets;
513
514	$self->update;	608	$self->update;
515	}	609	}
516		610
517	sub children {	611	sub children {
518	@{ $_[0]{children} }	612	@{ $_[0]{children} }
…		…
625	}	719	}
626		720
627	sub update {	721	sub update {
628	my ($self) = @_;	722	my ($self) = @_;
629		723
630	$ROOT->on_refresh ($self => sub { $self->render_child });	724	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	725	$self->SUPER::update;
632	}	726	}
633		727
634	sub size_allocate {	728	sub size_allocate {
635	my ($self, $w, $h) = @_;	729	my ($self, $w, $h) = @_;
…		…
648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	742	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649	glClearColor 0, 0, 0, 0;	743	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	744	glClear GL_COLOR_BUFFER_BIT;
651		745
652	$self->_render;	746	$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	};	747	};
661	}	748	}
662		749
663	sub _draw {	750	sub _draw {
664	my ($self) = @_;	751	my ($self) = @_;
…		…
666	my ($w, $h) = ($self->w, $self->h);	753	my ($w, $h) = ($self->w, $self->h);
667		754
668	my $tex = $self->{texture}	755	my $tex = $self->{texture}
669	or return;	756	or return;
670		757
671	glEnable GL_BLEND;
672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	758	glEnable GL_TEXTURE_2D;
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	759	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675	glColor 0, 0, 0, 1;	760	glColor 1, 1, 1, 1;
676		761
677	$tex->draw_quad (0, 0, $w, $h);	762	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678		763
679	glDisable GL_BLEND;
680	glDisable GL_TEXTURE_2D;	764	glDisable GL_TEXTURE_2D;
681	}	765	}
682		766
683	#############################################################################	767	#############################################################################
684		768
685	package CFClient::UI::ViewPort;	769	package CFClient::UI::ViewPort;
686		770
687	our @ISA = CFClient::UI::Window::;	771	our @ISA = CFClient::UI::Window::;
688		772
		773	sub new {
		774	my $class = shift;
		775
		776	$class->SUPER::new (
		777	scroll_x => 0,
		778	scroll_y => 1,
		779	@_,
		780	)
		781	}
		782
689	sub size_request {	783	sub size_request {
690	my ($self) = @_;	784	my ($self) = @_;
691		785
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	786	@$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		787
695	@$self{qw(child_w child_h)}	788	@$self{qw(child_w child_h)}
696	}	789	}
697		790
698	sub size_allocate {	791	sub size_allocate {
699	my ($self, $w, $h) = @_;	792	my ($self, $w, $h) = @_;
700		793
		794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		796
		797	$self->child->configure (0, 0, $w, $h);
701	$self->update;	798	$self->update;
702	}	799	}
703		800
704	sub set_offset {	801	sub set_offset {
705	my ($self, $x, $y) = @_;	802	my ($self, $x, $y) = @_;
…		…
759		856
760	my $slider = new CFClient::UI::Slider	857	my $slider = new CFClient::UI::Slider
761	vertical => 1,	858	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	859	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	860	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	861	$self->{vp}->set_offset (0, $_[1]);
765	},	862	},
766	;	863	;
767		864
768	$self = $class->SUPER::new (	865	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	866	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	867	slider => $slider,
771	@_,	868	@_,
772	);	869	);
773		870
774	$self->{vp}->add ($self->{scrolled});	871	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	873	$self->add ($self->{slider});
777		874
778	$self	875	$self
779	}	876	}
780		877
		878	sub size_allocate {
		879	my ($self, $w, $h) = @_;
		880
		881	$self->SUPER::size_allocate ($w, $h);
		882
		883	my $child = $self->{vp}->child;
		884	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		885	}
		886
781	#TODO# update range on size_allocate depeneing on child	887	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	888	# update viewport offset on scroll
783		889
784	#############################################################################	890	#############################################################################
785		891
786	package CFClient::UI::Frame;	892	package CFClient::UI::Frame;
…		…
790	use CFClient::OpenGL;	896	use CFClient::OpenGL;
791		897
792	sub new {	898	sub new {
793	my $class = shift;	899	my $class = shift;
794		900
795	my $self = $class->SUPER::new (	901	$class->SUPER::new (
796	bg => [1, 1, 1, 1],	902	bg => undef,
797	border_bg => [1, 1, 1, 1],
798	border => 0.8,
799	@_	903	@_,
800	);	904	)
801
802	$self
803	}	905	}
804		906
805	sub _draw {	907	sub _draw {
806	my ($self) = @_;	908	my ($self) = @_;
807		909
808	my ($w, $h) = ($self->{w}, $self->{h});	910	if ($self->{bg}) {
		911	my ($w, $h) = @$self{qw(w h)};
809		912
810	glEnable GL_BLEND;	913	glEnable GL_BLEND;
811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	914	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812	glEnable GL_TEXTURE_2D;	915	glColor @{ $self->{bg} };
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814		916
815	# glBegin GL_QUADS;	917	glBegin GL_QUADS;
816	# glColor 0, 0, 0, 0;
817	# glVertex 0 , 0;	918	glVertex 0 , 0;
818	# glVertex 0 , $h;	919	glVertex 0 , $h;
819	# glVertex $w, $h;	920	glVertex $w, $h;
820	# glVertex $w, 0;	921	glVertex $w, 0;
821	# glEnd;	922	glEnd;
822		923
823
824	$self->child->draw;
825	glDisable GL_BLEND;	924	glDisable GL_BLEND;
826	glDisable GL_TEXTURE_2D;	925	}
		926
		927	$self->SUPER::_draw;
827	}	928	}
828		929
829	#############################################################################	930	#############################################################################
830		931
831	package CFClient::UI::FancyFrame;	932	package CFClient::UI::FancyFrame;
…		…
842	my $class = shift;	943	my $class = shift;
843		944
844	# TODO: user_x, user_y, overwrite moveto?	945	# TODO: user_x, user_y, overwrite moveto?
845		946
846	my $self = $class->SUPER::new (	947	my $self = $class->SUPER::new (
847	bg => [1, 1, 1, 1],	948	bg => [1, 1, 1, 1],
848	border_bg => [1, 1, 1, 1],	949	border_bg => [1, 1, 1, 1],
849	border => 0.6,	950	border => 0.6,
		951	is_toplevel => 1,
850	can_events => 1,	952	can_events => 1,
851	@_	953	@_
852	);	954	);
853		955
854	$self->{title} &&= new CFClient::UI::Label	956	$self->{title} &&= new CFClient::UI::Label
855	align => 0,	957	align => 0,
…		…
879	my ($self, $w, $h) = @_;	981	my ($self, $w, $h) = @_;
880		982
881	$h -= List::Util::max 0, $self->border * 2;	983	$h -= List::Util::max 0, $self->border * 2;
882	$w -= List::Util::max 0, $self->border * 2;	984	$w -= List::Util::max 0, $self->border * 2;
883		985
884	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885	if $self->{title};	987	if $self->{title};
886		988
887	$self->child->configure ($self->border, $self->border, $w, $h);	989	$self->child->configure ($self->border, $self->border, $w, $h);
888	}	990	}
889		991
…		…
947	my ($self) = @_;	1049	my ($self) = @_;
948		1050
949	my ($w, $h ) = ($self->{w}, $self->{h});	1051	my ($w, $h ) = ($self->{w}, $self->{h});
950	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1052	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951		1053
952	glEnable GL_BLEND;
953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954	glEnable GL_TEXTURE_2D;	1054	glEnable GL_TEXTURE_2D;
955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956		1056
957	my $border = $self->border;	1057	my $border = $self->border;
958		1058
959	glColor @{ $self->{border_bg} };	1059	glColor @{ $self->{border_bg} };
960	$tex[1]->draw_quad (0, 0, $w, $border);	1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
961	$tex[3]->draw_quad (0, $border, $border, $ch);	1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964		1064
965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966	my $bg = $tex[0];	1066	my $bg = $tex[0];
967		1067
968	# TODO: repeat texture not scale	1068	# TODO: repeat texture not scale
…		…
972	glColor @{ $self->{bg} };	1072	glColor @{ $self->{bg} };
973		1073
974	$bg->{s} = $rep_x;	1074	$bg->{s} = $rep_x;
975	$bg->{t} = $rep_y;	1075	$bg->{t} = $rep_y;
976	$bg->{wrap_mode} = 1;	1076	$bg->{wrap_mode} = 1;
977	$bg->draw_quad ($border, $border, $cw, $ch);	1077	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1078	}
978		1079
979	glDisable GL_TEXTURE_2D;	1080	glDisable GL_TEXTURE_2D;
980	glDisable GL_BLEND;
981	}
982		1081
983	$self->{title}->draw if $self->{title};	1082	$self->{title}->draw if $self->{title};
984		1083
985	$self->child->draw;	1084	$self->child->draw;
986	}	1085	}
…		…
998	sub new {	1097	sub new {
999	my $class = shift;	1098	my $class = shift;
1000		1099
1001	$class->SUPER::new (	1100	$class->SUPER::new (
1002	col_expand => [],	1101	col_expand => [],
1003	@_	1102	@_,
1004	)	1103	)
1005	}	1104	}
1006		1105
1007	sub add {	1106	sub add {
1008	my ($self, $x, $y, $child) = @_;	1107	my ($self, $x, $y, $child) = @_;
…		…
1213	}	1312	}
1214		1313
1215	sub size_allocate {	1314	sub size_allocate {
1216	my ($self, $w, $h) = @_;	1315	my ($self, $w, $h) = @_;
1217		1316
		1317	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1318
1218	my $children = $self->{children};	1319	my $children = $self->{children};
1219		1320
1220	my @h = map $_->{req_h}, @$children;	1321	my @h = map $_->{req_h}, @$children;
1221		1322
1222	my $req_h = List::Util::sum @h;	1323	my $req_h = List::Util::sum @h;
…		…
1251		1352
1252	#############################################################################	1353	#############################################################################
1253		1354
1254	package CFClient::UI::Label;	1355	package CFClient::UI::Label;
1255		1356
1256	our @ISA = CFClient::UI::Base::;	1357	our @ISA = CFClient::UI::DrawBG::;
1257		1358
1258	use CFClient::OpenGL;	1359	use CFClient::OpenGL;
1259		1360
1260	sub new {	1361	sub new {
1261	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1262		1363
1263	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1264	fg => [1, 1, 1],	1365	fg => [1, 1, 1],
		1366	#bg => none
		1367	#active_bg => none
1265	#font => default_font	1368	#font => default_font
		1369	#text => initial text
		1370	#markup => initial narkup
		1371	#max_w => maximum pixel width
		1372	ellipsise => 3, # end
		1373	layout => (new CFClient::Layout),
1266	fontsize => 1,	1374	fontsize => 1,
1267	text => "",
1268	align => -1,	1375	align => -1,
1269	valign => -1,	1376	valign => -1,
1270	padding => 2,	1377	padding => 2,
1271	layout => new CFClient::Layout,
1272	can_events => 0,	1378	can_events => 0,
1273	%arg	1379	%arg
1274	);	1380	);
1275		1381
1276	if (exists $self->{template}) {	1382	if (exists $self->{template}) {
1277	my $layout = new CFClient::Layout;	1383	my $layout = new CFClient::Layout;
1278	$layout->set_text (delete $self->{template});	1384	$layout->set_text (delete $self->{template});
1279	$self->{template} = $layout;	1385	$self->{template} = $layout;
1280	}	1386	}
1281		1387
1282	$self->set_text (delete $self->{text}) if exists $self->{text};	1388	if (exists $self->{markup}) {
1283	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1389	$self->set_markup (delete $self->{markup});
		1390	} else {
		1391	$self->set_text (delete $self->{text});
		1392	}
1284		1393
1285	$self	1394	$self
1286	}	1395	}
1287		1396
1288	sub escape {	1397	sub escape($) {
1289	local $_ = $_[1];	1398	local $_ = $_[0];
1290		1399
1291	s/&/&amp;/g;	1400	s/&/&amp;/g;
1292	s/>/&gt;/g;	1401	s/>/&gt;/g;
1293	s/</&lt;/g;	1402	s/</&lt;/g;
1294		1403
1295	$_[1]	1404	$_
1296	}	1405	}
1297		1406
1298	sub update {	1407	sub update {
1299	my ($self) = @_;	1408	my ($self) = @_;
1300		1409
…		…
1306	my ($self, $text) = @_;	1415	my ($self, $text) = @_;
1307		1416
1308	return if $self->{text} eq "T$text";	1417	return if $self->{text} eq "T$text";
1309	$self->{text} = "T$text";	1418	$self->{text} = "T$text";
1310		1419
		1420	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311	$self->{layout}->set_text ($text);	1421	$self->{layout}->set_text ($text);
1312		1422
1313	$self->update;	1423	$self->update;
1314	$self->check_size;	1424	$self->check_size;
1315	}	1425	}
…		…
1318	my ($self, $markup) = @_;	1428	my ($self, $markup) = @_;
1319		1429
1320	return if $self->{text} eq "M$markup";	1430	return if $self->{text} eq "M$markup";
1321	$self->{text} = "M$markup";	1431	$self->{text} = "M$markup";
1322		1432
		1433	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1434
		1435	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323	$self->{layout}->set_markup ($markup);	1436	$self->{layout}->set_markup ($markup);
1324		1437
1325	$self->update;	1438	$self->update;
1326	$self->check_size;	1439	$self->check_size;
1327	}	1440	}
…		…
1329	sub size_request {	1442	sub size_request {
1330	my ($self) = @_;	1443	my ($self) = @_;
1331		1444
1332	$self->{layout}->set_font ($self->{font}) if $self->{font};	1445	$self->{layout}->set_font ($self->{font}) if $self->{font};
1333	$self->{layout}->set_width ($self->{max_w} || -1);	1446	$self->{layout}->set_width ($self->{max_w} || -1);
		1447	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1448	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1334	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1449	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335		1450
1336	my ($w, $h) = $self->{layout}->size;	1451	my ($w, $h) = $self->{layout}->size;
1337		1452
1338	if (exists $self->{template}) {	1453	if (exists $self->{template}) {
…		…
1368	}	1483	}
1369		1484
1370	sub _draw {	1485	sub _draw {
1371	my ($self) = @_;	1486	my ($self) = @_;
1372		1487
		1488	$self->SUPER::_draw; # draw background, if applicable
		1489
1373	my $tex = $self->{texture} ||= do {	1490	my $tex = $self->{texture} ||= do {
		1491	$self->{layout}->set_foreground (@{$self->{fg}});
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1492	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$self->{layout}->set_width ($self->{w});	1493	$self->{layout}->set_width ($self->{w});
		1494	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1495	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1497
1377	new_from_layout CFClient::Texture $self->{layout}	1498	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1499
		1500	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1501	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1502	: ($self->{w} - $tex->{w}) * 0.5);
		1503
		1504	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1505	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1506	: ($self->{h} - $tex->{h}) * 0.5);
		1507
		1508	$tex
1378	};	1509	};
1379		1510
1380	glEnable GL_BLEND;
1381	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382	glEnable GL_TEXTURE_2D;	1511	glEnable GL_TEXTURE_2D;
1383	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1512	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384		1513
		1514	if ($tex->{format} == GL_ALPHA) {
1385	glColor @{$self->{fg}};	1515	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});	1516	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1517	} else {
		1518	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1519	}
1400		1520
1401	glDisable GL_TEXTURE_2D;	1521	glDisable GL_TEXTURE_2D;
1402	glDisable GL_BLEND;
1403	}	1522	}
1404		1523
1405	#############################################################################	1524	#############################################################################
1406		1525
1407	package CFClient::UI::EntryBase;	1526	package CFClient::UI::EntryBase;
…		…
1420	active_fg => [0, 0, 0],	1539	active_fg => [0, 0, 0],
1421	can_hover => 1,	1540	can_hover => 1,
1422	can_focus => 1,	1541	can_focus => 1,
1423	valign => 0,	1542	valign => 0,
1424	can_events => 1,	1543	can_events => 1,
		1544	#text => ...
1425	@_	1545	@_
1426	)	1546	)
1427	}	1547	}
1428		1548
1429	sub _set_text {	1549	sub _set_text {
…		…
1439	$self->{text} = $text;	1559	$self->{text} = $text;
1440		1560
1441	$text =~ s/./*/g if $self->{hidden};	1561	$text =~ s/./*/g if $self->{hidden};
1442	$self->{layout}->set_text ("$text ");	1562	$self->{layout}->set_text ("$text ");
1443		1563
1444	$self->emit (changed => $self->{text});	1564	$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	}	1565	}
1464		1566
1465	sub set_text {	1567	sub set_text {
1466	my ($self, $text) = @_;	1568	my ($self, $text) = @_;
1467		1569
1468	$self->{cursor} = length $text;	1570	$self->{cursor} = length $text;
1469	$self->_set_text ($text);	1571	$self->_set_text ($text);
1470	$self->update;	1572	$self->update;
		1573	$self->check_size;
		1574	}
		1575
		1576	sub get_text {
		1577	$_[0]{text}
		1578	}
		1579
		1580	sub size_request {
		1581	my ($self) = @_;
		1582
		1583	my ($w, $h) = $self->SUPER::size_request;
		1584
		1585	($w + 1, $h) # add 1 for cursor
1471	}	1586	}
1472		1587
1473	sub key_down {	1588	sub key_down {
1474	my ($self, $ev) = @_;	1589	my ($self, $ev) = @_;
1475		1590
…		…
1477	my $sym = $ev->{sym};	1592	my $sym = $ev->{sym};
1478	my $uni = $ev->{unicode};	1593	my $uni = $ev->{unicode};
1479		1594
1480	my $text = $self->get_text;	1595	my $text = $self->get_text;
1481		1596
1482	if ($sym == 8) {	1597	if ($uni == 8) {
1483	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1598	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484	} elsif ($sym == 127) {	1599	} elsif ($uni == 127) {
1485	substr $text, $self->{cursor}, 1, "";	1600	substr $text, $self->{cursor}, 1, "";
1486	} elsif ($sym == CFClient::SDLK_LEFT) {	1601	} elsif ($sym == CFClient::SDLK_LEFT) {
1487	--$self->{cursor} if $self->{cursor};	1602	--$self->{cursor} if $self->{cursor};
1488	} elsif ($sym == CFClient::SDLK_RIGHT) {	1603	} elsif ($sym == CFClient::SDLK_RIGHT) {
1489	++$self->{cursor} if $self->{cursor} < length $self->{text};	1604	++$self->{cursor} if $self->{cursor} < length $self->{text};
1490	} elsif ($sym == CFClient::SDLK_HOME) {	1605	} elsif ($sym == CFClient::SDLK_HOME) {
1491	$self->{cursor} = 0;	1606	$self->{cursor} = 0;
1492	} elsif ($sym == CFClient::SDLK_END) {	1607	} elsif ($sym == CFClient::SDLK_END) {
1493	$self->{cursor} = length $text;	1608	$self->{cursor} = length $text;
1494	} elsif ($sym == 27) {	1609	} elsif ($uni == 27) {
1495	$self->emit ('escape');	1610	$self->_emit ('escape');
1496	} elsif ($uni) {	1611	} elsif ($uni) {
1497	substr $text, $self->{cursor}++, 0, chr $uni;	1612	substr $text, $self->{cursor}++, 0, chr $uni;
1498	}	1613	}
1499		1614
1500	$self->_set_text ($text);	1615	$self->_set_text ($text);
1501	$self->update;	1616	$self->update;
		1617	$self->check_size;
1502	}	1618	}
1503		1619
1504	sub focus_in {	1620	sub focus_in {
1505	my ($self) = @_;	1621	my ($self) = @_;
1506		1622
…		…
1586	if ($sym == 13) {	1702	if ($sym == 13) {
1587	unshift @{$self->{history}},	1703	unshift @{$self->{history}},
1588	my $txt = $self->get_text;	1704	my $txt = $self->get_text;
1589	$self->{history_pointer} = -1;	1705	$self->{history_pointer} = -1;
1590	$self->{history_saveback} = '';	1706	$self->{history_saveback} = '';
1591	$self->emit (activate => $txt);	1707	$self->_emit (activate => $txt);
1592	$self->update;	1708	$self->update;
1593		1709
1594	} elsif ($sym == CFClient::SDLK_UP) {	1710	} elsif ($sym == CFClient::SDLK_UP) {
1595	if ($self->{history_pointer} < 0) {	1711	if ($self->{history_pointer} < 0) {
1596	$self->{history_saveback} = $self->get_text;	1712	$self->{history_saveback} = $self->get_text;
…		…
1635	my $class = shift;	1751	my $class = shift;
1636		1752
1637	$class->SUPER::new (	1753	$class->SUPER::new (
1638	padding => 4,	1754	padding => 4,
1639	fg => [1, 1, 1],	1755	fg => [1, 1, 1],
1640	bg => [1, 1, 1, 0.2],
1641	active_fg => [0, 0, 1],	1756	active_fg => [0, 0, 1],
1642	can_hover => 1,	1757	can_hover => 1,
1643	align => 0,	1758	align => 0,
1644	valign => 0,	1759	valign => 0,
1645	can_events => 1,	1760	can_events => 1,
1646	@_	1761	@_
1647	)	1762	)
1648	}	1763	}
1649		1764
		1765	sub activate { }
		1766
1650	sub button_up {	1767	sub button_up {
1651	my ($self, $ev, $x, $y) = @_;	1768	my ($self, $ev, $x, $y) = @_;
1652		1769
		1770	$self->emit ("activate")
1653	if ($x >= 0 && $x < $self->{w}	1771	if $x >= 0 && $x < $self->{w}
1654	&& $y >= 0 && $y < $self->{h}) {	1772	&& $y >= 0 && $y < $self->{h};
1655	$self->emit ("activate");
1656	}
1657	}	1773	}
1658		1774
1659	sub _draw {	1775	sub _draw {
1660	my ($self) = @_;	1776	my ($self) = @_;
1661		1777
…		…
1663		1779
1664	if ($GRAB == $self) {	1780	if ($GRAB == $self) {
1665	$self->{fg} = $self->{active_fg};	1781	$self->{fg} = $self->{active_fg};
1666	}	1782	}
1667		1783
1668	glEnable GL_BLEND;
1669	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670	glEnable GL_TEXTURE_2D;	1784	glEnable GL_TEXTURE_2D;
1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1785	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672	glColor 0, 0, 0, 1;	1786	glColor 0, 0, 0, 1;
1673		1787
1674	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1788	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675		1789
1676	glDisable GL_TEXTURE_2D;	1790	glDisable GL_TEXTURE_2D;
1677	glDisable GL_BLEND;
1678		1791
1679	$self->SUPER::_draw;	1792	$self->SUPER::_draw;
1680	}	1793	}
1681		1794
1682	#############################################################################	1795	#############################################################################
…		…
1696		1809
1697	$class->SUPER::new (	1810	$class->SUPER::new (
1698	padding => 2,	1811	padding => 2,
1699	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1700	active_fg => [1, 1, 0],	1813	active_fg => [1, 1, 0],
		1814	bg => [0, 0, 0, 0.2],
		1815	active_bg => [1, 1, 1, 0.5],
1701	state => 0,	1816	state => 0,
1702	can_hover => 1,	1817	can_hover => 1,
1703	@_	1818	@_
1704	)	1819	)
1705	}	1820	}
…		…
1714	my ($self, $ev, $x, $y) = @_;	1829	my ($self, $ev, $x, $y) = @_;
1715		1830
1716	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1831	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1832	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718	$self->{state} = !$self->{state};	1833	$self->{state} = !$self->{state};
1719	$self->emit (changed => $self->{state});	1834	$self->_emit (changed => $self->{state});
1720	}	1835	}
1721	}	1836	}
1722		1837
1723	sub _draw {	1838	sub _draw {
1724	my ($self) = @_;	1839	my ($self) = @_;
…		…
1729		1844
1730	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1845	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731		1846
1732	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1847	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733		1848
1734	glEnable GL_BLEND;	1849	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1850
1735	glEnable GL_TEXTURE_2D;	1851	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);	1852	$tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742	glDisable GL_TEXTURE_2D;	1853	glDisable GL_TEXTURE_2D;
1743	glDisable GL_BLEND;
1744	}	1854	}
1745		1855
1746	#############################################################################	1856	#############################################################################
1747		1857
1748	package CFClient::UI::Image;	1858	package CFClient::UI::Image;
…		…
1791	glTranslate 0, -$self->{w}, 0;	1901	glTranslate 0, -$self->{w}, 0;
1792		1902
1793	($w, $h) = ($h, $w);	1903	($w, $h) = ($h, $w);
1794	}	1904	}
1795		1905
1796	glEnable GL_BLEND;
1797	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798	glEnable GL_TEXTURE_2D;	1906	glEnable GL_TEXTURE_2D;
1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1907	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800		1908
1801	$tex->draw_quad (0, 0, $w, $h);	1909	$tex->draw_quad_alpha (0, 0, $w, $h);
1802		1910
1803	glDisable GL_BLEND;
1804	glDisable GL_TEXTURE_2D;	1911	glDisable GL_TEXTURE_2D;
1805	}	1912	}
1806		1913
1807	#############################################################################	1914	#############################################################################
1808		1915
…		…
1997	qw(s1_slider.png s1_slider_bg.png);	2104	qw(s1_slider.png s1_slider_bg.png);
1998		2105
1999	sub new {	2106	sub new {
2000	my $class = shift;	2107	my $class = shift;
2001		2108
2002	# range [value, low, high, page]	2109	# range [value, low, high, page, unit]
2003		2110
2004	# TODO: 0-width page	2111	# TODO: 0-width page
2005	# TODO: req_w/h are wrong with vertical	2112	# TODO: req_w/h are wrong with vertical
2006	# TODO: calculations are off	2113	# TODO: calculations are off
2007	my $self = $class->SUPER::new (	2114	my $self = $class->SUPER::new (
2008	fg => [1, 1, 1],	2115	fg => [1, 1, 1],
2009	active_fg => [0, 0, 0],	2116	active_fg => [0, 0, 0],
		2117	bg => [0, 0, 0, 0.2],
		2118	active_bg => [1, 1, 1, 0.5],
2010	range => [0, 0, 100, 10],	2119	range => [0, 0, 100, 10, 0],
2011	req_w => $::WIDTH / 80,	2120	req_w => $::WIDTH / 80,
2012	req_h => $::WIDTH / 80,	2121	req_h => $::WIDTH / 80,
2013	vertical => 0,	2122	vertical => 0,
2014	can_hover => 1,	2123	can_hover => 1,
2015	inner_pad => 5,	2124	inner_pad => 0.02,
2016	@_	2125	@_
2017	);	2126	);
2018		2127
		2128	$self->set_value ($self->{range}[0]);
		2129	$self->update;
		2130
2019	$self	2131	$self
		2132	}
		2133
		2134	sub set_range {
		2135	my ($self, $range) = @_;
		2136
		2137	$self->{range} = $range;
		2138
		2139	$self->update;
		2140	}
		2141
		2142	sub set_value {
		2143	my ($self, $value) = @_;
		2144
		2145	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2146
		2147	$hi = $lo + 1 if $hi <= $lo;
		2148
		2149	$page = $hi - $lo if $page > $hi - $lo;
		2150
		2151	$value = $lo if $value < $lo;
		2152	$value = $hi - $page if $value > $hi - $page;
		2153
		2154	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2155	if $unit;
		2156
		2157	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2158
		2159	if ($value != $old_value) {
		2160	$self->_emit (changed => $value);
		2161	$self->update;
		2162	}
2020	}	2163	}
2021		2164
2022	sub size_request {	2165	sub size_request {
2023	my ($self) = @_;	2166	my ($self) = @_;
2024		2167
…		…
2030		2173
2031	sub button_down {	2174	sub button_down {
2032	my ($self, $ev, $x, $y) = @_;	2175	my ($self, $ev, $x, $y) = @_;
2033		2176
2034	$self->SUPER::button_down ($ev, $x, $y);	2177	$self->SUPER::button_down ($ev, $x, $y);
		2178
		2179	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2180
2035	$self->mouse_motion ($ev, $x, $y);	2181	$self->mouse_motion ($ev, $x, $y);
2036	}	2182	}
2037		2183
2038	sub mouse_motion {	2184	sub mouse_motion {
2039	my ($self, $ev, $x, $y) = @_;	2185	my ($self, $ev, $x, $y) = @_;
2040		2186
2041	if ($GRAB == $self) {	2187	if ($GRAB == $self) {
		2188	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2189
		2190	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2191
		2192	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2193
		2194	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2195	}
		2196	}
		2197
		2198	sub update {
		2199	my ($self) = @_;
		2200
		2201	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2202	$self->set_value ($self->{range}[0]);
		2203
2042	my ($value, $lo, $hi, $page) = @{$self->{range}};	2204	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2205	my $range = ($hi - $page - $lo) || 1e-100;
2043		2206
2044	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2207	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045		2208
2046	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2209	$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	2210	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048		2211
2049	$x -= $inner_pad_px; # substract the padding	2212	$value = ($value - $lo) / $range;
2050	$x = $x * ($hi - $lo) / $inner_w + $lo;	2213	$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		2214
2055	$self->emit (changed => $x);	2215	$self->{knob_x} = $value - $knob_w * 0.5;
2056	$self->update;	2216	$self->{knob_w} = $knob_w;
2057	}	2217	});
2058	}
2059		2218
2060	# the inner_* stuff is for generating a padding for the slider handle,	2219	$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	}	2220	}
2067		2221
2068	sub _draw {	2222	sub _draw {
2069	my ($self) = @_;	2223	my ($self) = @_;
2070		2224
2071	$self->SUPER::_draw ();	2225	$self->SUPER::_draw ();
2072		2226
2073	my ($w, $h) = @$self{qw(w h)};	2227	glScale $self->{w}, $self->{h};
2074		2228
2075	if ($self->{vertical}) {	2229	if ($self->{vertical}) {
2076	# draw a vertical slider like a rotated horizontal slider	2230	# draw a vertical slider like a rotated horizontal slider
2077		2231
		2232	glTranslate 1, 0, 0;
2078	glRotate 90, 0, 0, 1;	2233	glRotate 90, 0, 0, 1;
2079	glTranslate 0, -$self->{w}, 0;
2080
2081	($w, $h) = ($h, $w);
2082	}	2234	}
2083		2235
2084	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2236	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2237	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086		2238
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;	2239	glEnable GL_TEXTURE_2D;
2108	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109		2241
2110	# draw background	2242	# draw background
2111	$tex[1]->draw_quad (0, 0, $w, $h);	2243	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112		2244
2113	# draw handle	2245	# draw handle
2114	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2246	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115		2247
2116	glDisable GL_BLEND;
2117	glDisable GL_TEXTURE_2D;	2248	glDisable GL_TEXTURE_2D;
2118	}	2249	}
		2250
		2251	#############################################################################
		2252
		2253	package CFClient::UI::ValSlider;
		2254
		2255	our @ISA = CFClient::UI::HBox::;
		2256
		2257	sub new {
		2258	my ($class, %arg) = @_;
		2259
		2260	my $range = delete $arg{range};
		2261
		2262	my $self = $class->SUPER::new (
		2263	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2264	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2265	to_value => sub { shift },
		2266	from_value => sub { shift },
		2267	%arg,
		2268	);
		2269
		2270	$self->{slider}->connect (changed => sub {
		2271	my ($self, $value) = @_;
		2272	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2273	$self->{parent}->emit (changed => $value);
		2274	});
		2275
		2276	# $self->{entry}->connect (changed => sub {
		2277	# my ($self, $value) = @_;
		2278	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2279	# $self->{parent}->emit (changed => $value);
		2280	# });
		2281
		2282	$self->add ($self->{slider}, $self->{entry});
		2283
		2284	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2285
		2286	$self
		2287	}
		2288
		2289	sub set_range { shift->{slider}->set_range (@_) }
		2290	sub set_value { shift->{slider}->set_value (@_) }
2119		2291
2120	#############################################################################	2292	#############################################################################
2121		2293
2122	package CFClient::UI::TextView;	2294	package CFClient::UI::TextView;
2123		2295
…		…
2132	fontsize => 1,	2304	fontsize => 1,
2133	can_events => 0,	2305	can_events => 0,
2134	#font => default_font	2306	#font => default_font
2135	@_,	2307	@_,
2136		2308
2137	layout => (new CFClient::Layout),	2309	layout => (new CFClient::Layout 1),
2138	par => [],	2310	par => [],
2139	height => 0,	2311	height => 0,
2140	children => [	2312	children => [
2141	(new CFClient::UI::Empty expand => 1),	2313	(new CFClient::UI::Empty expand => 1),
2142	(new CFClient::UI::Slider vertical => 1),	2314	(new CFClient::UI::Slider vertical => 1),
…		…
2153		2325
2154	$self->{fontsize} = $fontsize;	2326	$self->{fontsize} = $fontsize;
2155	$self->reflow;	2327	$self->reflow;
2156	}	2328	}
2157		2329
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 {	2330	sub size_allocate {
2178	my ($self, $w, $h) = @_;	2331	my ($self, $w, $h) = @_;
2179		2332
2180	$self->SUPER::size_allocate ($w, $h);	2333	$self->SUPER::size_allocate ($w, $h);
2181		2334
…		…
2184	$self->{layout}->set_width ($self->{children}[0]{w});	2337	$self->{layout}->set_width ($self->{children}[0]{w});
2185		2338
2186	$self->reflow;	2339	$self->reflow;
2187	}	2340	}
2188		2341
		2342	sub text_size {
		2343	my ($self, $text, $indent) = @_;
		2344
		2345	my $layout = $self->{layout};
		2346
		2347	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2348	$layout->set_width ($self->{children}[0]{w} - $indent);
		2349	$layout->set_markup ($text);
		2350
		2351	$layout->size
		2352	}
		2353
		2354	sub reflow {
		2355	my ($self) = @_;
		2356
		2357	$self->{need_reflow}++;
		2358	$self->update;
		2359	}
		2360
		2361	sub set_offset {
		2362	my ($self, $offset) = @_;
		2363
		2364	# todo: base offset on lines or so, not on pixels
		2365	$self->{children}[1]->set_value ($offset);
		2366	}
		2367
		2368	sub clear {
		2369	my ($self) = @_;
		2370
		2371	$self->{par} = [];
		2372	$self->{height} = 0;
		2373	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2374	}
		2375
2189	sub add_paragraph {	2376	sub add_paragraph {
2190	my ($self, $color, $text) = @_;	2377	my ($self, $color, $text, $indent) = @_;
2191		2378
2192	#TODO: intelligently "reformat" paragraph	2379	for my $line (split /\n/, $text) {
2193		2380	my ($w, $h) = $self->text_size ($line);
2194	my $height = $self->text_height ($text);
2195
2196	$self->{height} += $height;	2381	$self->{height} += $h;
		2382	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2383	}
2197		2384
2198	push @{$self->{par}}, [$height, $color, $text];
2199
2200	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2385	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2201	$self->{children}[1]->update;
2202	}	2386	}
2203		2387
2204	sub update {	2388	sub update {
2205	my ($self) = @_;	2389	my ($self) = @_;
2206		2390
…		…
2208		2392
2209	return unless $self->{h} > 0;	2393	return unless $self->{h} > 0;
2210		2394
2211	delete $self->{texture};	2395	delete $self->{texture};
2212		2396
2213	$ROOT->on_refresh ($self, sub {	2397	$ROOT->on_post_alloc ($self, sub {
		2398	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2399
2214	if (delete $self->{need_reflow}) {	2400	if (delete $self->{need_reflow}) {
2215	my $height = 0;	2401	my $height = 0;
2216		2402
2217	$height += $_->[0] = $self->text_height ($_->[2])	2403	my $layout = $self->{layout};
		2404
		2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2406
2218	for @{$self->{par}};	2407	for (@{$self->{par}}) {
		2408	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2409	$layout->set_width ($W - $_->[3]);
		2410	$layout->set_markup ($_->[4]);
		2411	my ($w, $h) = $layout->size;
		2412	$_->[0] = $w + $_->[3];
		2413	$_->[1] = $h;
		2414	}
		2415
		2416	$height += $_->[1];
		2417	}
2219		2418
2220	$self->{height} = $height;	2419	$self->{height} = $height;
2221		2420
2222	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2421	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2223		2422
2224	delete $self->{texture};	2423	delete $self->{texture};
2225	}	2424	}
2226		2425
2227	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2426	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2228	glClearColor 0, 0, 0, 0;	2427	glClearColor 0.5, 0.5, 0.5, 0;
2229	glClear GL_COLOR_BUFFER_BIT;	2428	glClear GL_COLOR_BUFFER_BIT;
2230		2429
		2430	my $top = int $self->{children}[1]{range}[0];
		2431
		2432	my $y0 = $top;
		2433	my $y1 = $top + $H;
		2434
		2435	my $y = 0;
		2436
		2437	my $layout = $self->{layout};
		2438
		2439	$layout->set_font ($self->{font}) if $self->{font};
		2440
2231	glEnable GL_BLEND;	2441	glEnable GL_BLEND;
		2442	#TODO# not correct in windows where rgba is forced off
2232	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2443	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		2444
2247	for my $par (@{$self->{par}}) {	2445	for my $par (@{$self->{par}}) {
2248	my $h = $par->[0];	2446	my $h = $par->[1];
2249		2447
2250	if ($y0 < $y + $h && $y < $y1) {	2448	if ($y0 < $y + $h && $y < $y1) {
		2449	$layout->set_foreground (@{ $par->[2] });
		2450	$layout->set_width ($W - $par->[3]);
2251	$layout->set_text ($par->[2]);	2451	$layout->set_markup ($par->[4]);
2252		2452
2253	glColor @{ $par->[1] };	2453	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254	my ($W, $H) = $layout->size;	2454
2255	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2455	glRasterPos $par->[3], $y - $y0;
		2456	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2256	}	2457	}
2257		2458
2258	$y += $h;	2459	$y += $h;
2259	}	2460	}
2260		2461
2261	glDisable GL_TEXTURE_2D;
2262	glDisable GL_BLEND;	2462	glDisable GL_BLEND;
2263	};	2463	};
2264	});	2464	});
2265	}	2465	}
2266		2466
2267	sub _draw {	2467	sub _draw {
2268	my ($self) = @_;	2468	my ($self) = @_;
2269		2469
2270	glEnable GL_BLEND;
2271	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272	glEnable GL_TEXTURE_2D;	2470	glEnable GL_TEXTURE_2D;
2273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2471	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274	glColor 1, 1, 1, 1;	2472	glColor 1, 1, 1, 1;
2275	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2473	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276	glDisable GL_TEXTURE_2D;	2474	glDisable GL_TEXTURE_2D;
2277	glDisable GL_BLEND;
2278		2475
2279	$self->{children}[1]->draw;	2476	$self->{children}[1]->draw;
2280		2477
2281	}	2478	}
2282		2479
…		…
2350		2547
2351	# TODO: use animation	2548	# TODO: use animation
2352	if ($self->{state} = !$self->{state}) {	2549	if ($self->{state} = !$self->{state}) {
2353	$CFClient::UI::ROOT->add ($self->{other});	2550	$CFClient::UI::ROOT->add ($self->{other});
2354	$self->{other}->move ($self->coord2global (0, $self->{h}));	2551	$self->{other}->move ($self->coord2global (0, $self->{h}));
2355	$self->emit ("open");	2552	$self->_emit ("open");
2356	} else {	2553	} else {
2357	$CFClient::UI::ROOT->remove ($self->{other});	2554	$CFClient::UI::ROOT->remove ($self->{other});
2358	$self->emit ("close");	2555	$self->_emit ("close");
2359	}	2556	}
2360		2557
2361	$self->emit (changed => $self->{state});	2558	$self->_emit (changed => $self->{state});
2362	}	2559	}
2363		2560
2364	#############################################################################	2561	#############################################################################
2365		2562
2366	package CFClient::UI::Tooltip;	2563	package CFClient::UI::Tooltip;
…		…
2376	@_,	2573	@_,
2377	can_events => 0,	2574	can_events => 0,
2378	)	2575	)
2379	}	2576	}
2380		2577
2381	sub set_markup {	2578	sub set_tooltip_from {
2382	my ($self, $text) = @_;	2579	my ($self, $widget) = @_;
2383		2580
2384	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2581	$self->add (new CFClient::UI::Label
2385	$self->{label}->set_markup ($text);	2582	markup => $widget->{tooltip},
2386	$self->add ($self->{label});	2583	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2584	fontsize => 0.8,
		2585	fg => [0, 0, 0, 1],
		2586	ellipsise => 0,
		2587	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2588	);
2387	}	2589	}
2388		2590
2389	sub size_request {	2591	sub size_request {
2390	my ($self) = @_;	2592	my ($self) = @_;
2391
2392	$self->child->set_max_size ($::WIDTH * 0.3);
2393		2593
2394	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2594	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395		2595
2396	($w + 4, $h + 4)	2596	($w + 4, $h + 4)
2397	}	2597	}
…		…
2403	}	2603	}
2404		2604
2405	sub _draw {	2605	sub _draw {
2406	my ($self) = @_;	2606	my ($self) = @_;
2407		2607
2408	glPushMatrix;
2409	glTranslate 0.375, 0.375;	2608	glTranslate 0.375, 0.375;
2410		2609
2411	my ($w, $h) = @$self{qw(w h)};	2610	my ($w, $h) = @$self{qw(w h)};
2412		2611
2413	glColor 1, 0.8, 0.4;	2612	glColor 1, 0.8, 0.4;
…		…
2424	glVertex 0 , $h;	2623	glVertex 0 , $h;
2425	glVertex $w, $h;	2624	glVertex $w, $h;
2426	glVertex $w, 0;	2625	glVertex $w, 0;
2427	glEnd;	2626	glEnd;
2428		2627
2429	glPopMatrix;	2628	glTranslate 2 - 0.375, 2 - 0.375;
2430
2431	glTranslate 2, 2;
2432	$self->SUPER::_draw;	2629	$self->SUPER::_draw;
2433	}	2630	}
2434		2631
2435	#############################################################################	2632	#############################################################################
2436		2633
…		…
2441	use CFClient::OpenGL;	2638	use CFClient::OpenGL;
2442		2639
2443	sub new {	2640	sub new {
2444	my $class = shift;	2641	my $class = shift;
2445		2642
2446	$class->SUPER::new (	2643	my $self = $class->SUPER::new (
2447	aspect => 1,	2644	aspect => 1,
		2645	can_events => 0,
2448	@_,	2646	@_,
2449	)	2647	);
		2648
		2649	if ($self->{anim} && $self->{animspeed}) {
		2650	Scalar::Util::weaken (my $widget = $self);
		2651
		2652	$self->{timer} = Event->timer (
		2653	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2654	hard => 1,
		2655	interval => $self->{animspeed},
		2656	cb => sub {
		2657	++$widget->{frame};
		2658	$widget->update;
		2659	},
		2660	);
		2661	}
		2662
		2663	$self
2450	}	2664	}
2451		2665
2452	sub size_request {	2666	sub size_request {
2453	(32, 8)	2667	(32, 8)
2454	}	2668	}
2455		2669
		2670	sub update {
		2671	my ($self) = @_;
		2672
		2673	return unless $self->{visible};
		2674
		2675	$self->SUPER::update;
		2676	}
		2677
2456	sub _draw {	2678	sub _draw {
2457	my ($self) = @_;	2679	my ($self) = @_;
2458		2680
2459	return unless $::CONN;#d# manage and cache textures differently	2681	return unless $::CONN;
		2682
		2683	my $face;
		2684
		2685	if ($self->{frame}) {
		2686	my $anim = $::CONN->{anim}[$self->{anim}];
		2687
		2688	$face = $anim->[ $self->{frame} % @$anim ]
		2689	if $anim && @$anim;
		2690	}
		2691
2460	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2692	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461		2693
2462	# TODO animation
2463	if ($tex) {	2694	if ($tex) {
2464	glEnable GL_BLEND;
2465	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466	glEnable GL_TEXTURE_2D;	2695	glEnable GL_TEXTURE_2D;
2467	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468	glColor 1, 1, 1, 1;	2697	glColor 1, 1, 1, 1;
2469	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2698	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470	glDisable GL_TEXTURE_2D;	2699	glDisable GL_TEXTURE_2D;
2471	glDisable GL_BLEND;
2472	}	2700	}
		2701	}
		2702
		2703	sub DESTROY {
		2704	my ($self) = @_;
		2705
		2706	$self->{timer}->cancel
		2707	if $self->{timer};
		2708
		2709	$self->SUPER::DESTROY;
2473	}	2710	}
2474		2711
2475	#############################################################################	2712	#############################################################################
2476		2713
2477	package CFClient::UI::InventoryItem;	2714	package CFClient::UI::InventoryItem;
…		…
2481	sub new {	2718	sub new {
2482	my $class = shift;	2719	my $class = shift;
2483		2720
2484	my %args = @_;	2721	my %args = @_;
2485		2722
2486	my $item = $args{item};	2723	my $item = delete $args{item};
2487		2724
2488	my $desc = $item->{nrof} < 2	2725	my $desc = CFClient::Item::desc_string $item;
2489	? $item->{name}
2490	: "$item->{nrof} $item->{name_pl}";
2491
2492		2726
2493	my $self = $class->SUPER::new (	2727	my $self = $class->SUPER::new (
2494	can_hover => 1,	2728	can_hover => 1,
2495	can_events => 1,	2729	can_events => 1,
2496	tooltip => (CFClient::UI::Label->escape ($desc)	2730	tooltip => ((CFClient::UI::Label::escape $desc)
2497	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2731	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2498	connect_button_down => sub {	2732	connect_button_down => sub {
2499	my ($self, $ev, $x, $y) = @_;	2733	my ($self, $ev, $x, $y) = @_;
2500		2734
2501	# todo: maybe put examine on 1? but should just be a tooltip :(	2735	# todo: maybe put examine on 1? but should just be a tooltip :(
		2736	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2737	my $targ = $::CONN->{player}{tag};
		2738
		2739	if ($item->{container} == $::CONN->{player}{tag}) {
		2740	$targ = $main::OPENCONT;
		2741	}
		2742
		2743	$::CONN->send ("move $targ $item->{tag} 0");
2502	if ($ev->{button} == 1) {	2744	} elsif ($ev->{button} == 1) {
2503	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2745	$::CONN->send ("examine $item->{tag}");
2504	} elsif ($ev->{button} == 2) {	2746	} elsif ($ev->{button} == 2) {
2505	$::CONN->send ("apply $item->{tag}");	2747	$::CONN->send ("apply $item->{tag}");
2506	} elsif ($ev->{button} == 3) {	2748	} elsif ($ev->{button} == 3) {
2507	CFClient::UI::Menu->new (	2749	my @menu_items = (
2508	items => [
2509	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2750	["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}") }],	2751	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2515	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2752	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2753	(
		2754	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2755	? (
		2756	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2757	)
		2758	: (
		2759	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2516	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2760	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2761	)
2517	],	2762	),
2518	)->popup ($ev);	2763	);
		2764
		2765	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2519	}	2766	}
2520		2767
2521	1	2768	1
2522	},	2769	},
2523	%args	2770	%args
2524	);	2771	);
		2772
		2773
2525	$self->add(new CFClient::UI::Face	2774	$self->add (new CFClient::UI::Face
2526	can_events => 0,	2775	can_events => 0,
2527	face => $item->{face},	2776	face => $item->{face},
2528	anim => $item->{anim},	2777	anim => $item->{anim},
2529	animspeed => $item->{animspeed});	2778	animspeed => $item->{animspeed},
2530	$self->add(new CFClient::UI::Label	2779	);
2531	can_events => 0,	2780
2532	text => $desc);	2781	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2782
		2783	$self->{item} = $item;
		2784
		2785	$self->update_item;
2533		2786
2534	$self	2787	$self
		2788	}
		2789
		2790	sub update_item {
		2791	my ($self) = @_;
		2792
		2793	my $desc = CFClient::Item::desc_string ($self->{item});
		2794
		2795	$self->{name_lbl}->set_text ($desc);
2535	}	2796	}
2536		2797
2537	#############################################################################	2798	#############################################################################
2538		2799
2539	package CFClient::UI::Inventory;	2800	package CFClient::UI::Inventory;
…		…
2542		2803
2543	sub new {	2804	sub new {
2544	my $class = shift;	2805	my $class = shift;
2545		2806
2546	my $self = $class->SUPER::new (	2807	my $self = $class->SUPER::new (
2547	scrolled => (new CFClient::UI::VBox),	2808	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2548	@_,	2809	@_,
2549	);	2810	);
2550		2811
2551	$self	2812	$self
2552	}	2813	}
…		…
2555	my ($self, $items) = @_;	2816	my ($self, $items) = @_;
2556		2817
2557	$self->{scrolled}->clear;	2818	$self->{scrolled}->clear;
2558	return unless $items;	2819	return unless $items;
2559		2820
2560	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2821	my @items = sort {
		2822	($a->{type} <=> $b->{type})
		2823	or ($a->{name} cmp $b->{name})
		2824	} @$items;
2561		2825
2562	$self->{real_items} = \@items;	2826	$self->{real_items} = \@items;
2563		2827
		2828	my $row = 0;
2564	for my $item (@items) {	2829	for my $item (@items) {
2565	my $desc = $item->{nrof} < 2	2830	CFClient::Item::update_widgets $item;
2566	? $item->{name}
2567	: "$item->{nrof} $item->{name_pl}";
2568		2831
2569	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2832	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2833	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2834	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		2835
		2836	$row++;
2570	}	2837	}
2571		2838
2572	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2839	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573	}	2840	}
2574		2841
…		…
2617		2884
2618	# popup given the event (must be a mouse button down event currently)	2885	# popup given the event (must be a mouse button down event currently)
2619	sub popup {	2886	sub popup {
2620	my ($self, $ev) = @_;	2887	my ($self, $ev) = @_;
2621		2888
2622	$self->emit ("popdown");	2889	$self->_emit ("popdown");
2623		2890
2624	# maybe save $GRAB? must be careful about events...	2891	# maybe save $GRAB? must be careful about events...
2625	$GRAB = $self;	2892	$GRAB = $self;
2626	$self->{button} = $ev->{button};	2893	$self->{button} = $ev->{button};
2627		2894
…		…
2642		2909
2643	if ($ev->{button} == $self->{button}) {	2910	if ($ev->{button} == $self->{button}) {
2644	undef $GRAB;	2911	undef $GRAB;
2645	$self->hide;	2912	$self->hide;
2646		2913
2647	$self->emit ("popdown");	2914	$self->_emit ("popdown");
2648	$self->{hover}[1]->() if $self->{hover};	2915	$self->{hover}[1]->() if $self->{hover};
2649	}	2916	}
		2917	}
		2918
		2919	#############################################################################
		2920
		2921	package CFClient::UI::Statusbox;
		2922
		2923	our @ISA = CFClient::UI::VBox::;
		2924
		2925	sub new {
		2926	my $class = shift;
		2927
		2928	$class->SUPER::new (
		2929	fontsize => 0.8,
		2930	@_,
		2931	)
		2932	}
		2933
		2934	sub reorder {
		2935	my ($self) = @_;
		2936	my $NOW = time;
		2937
		2938	while (my ($k, $v) = each %{ $self->{item} }) {
		2939	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2940	}
		2941
		2942	my @widgets;
		2943
		2944	my @items = sort {
		2945	$a->{pri} <=> $b->{pri}
		2946	or $b->{id} <=> $a->{id}
		2947	} values %{ $self->{item} };
		2948
		2949	my $count = 10 + 1;
		2950	for my $item (@items) {
		2951	last unless --$count;
		2952
		2953	push @widgets, $item->{label} ||= do {
		2954	# TODO: doesn't handle markup well (read as: at all)
		2955	my $short = $item->{count} > 1
		2956	? "<b>$item->{count} ×</b> $item->{text}"
		2957	: $item->{text};
		2958
		2959	for ($short) {
		2960	s/^\s+//;
		2961	s/\s+/ /g;
		2962	}
		2963
		2964	new CFClient::UI::Label
		2965	markup => $short,
		2966	tooltip => $item->{tooltip},
		2967	tooltip_font => $::FONT_PROP,
		2968	tooltip_width => 0.67,
		2969	fontsize => $item->{fontsize} || $self->{fontsize},
		2970	max_w => $::WIDTH * 0.44,
		2971	fg => $item->{fg},
		2972	can_events => 1,
		2973	can_hover => 1
		2974	};
		2975	}
		2976
		2977	$self->clear;
		2978	$self->SUPER::add (reverse @widgets);
		2979	}
		2980
		2981	sub add {
		2982	my ($self, $text, %arg) = @_;
		2983
		2984	$text =~ s/^\s+//;
		2985	$text =~ s/\s+$//;
		2986
		2987	return unless $text;
		2988
		2989	my $timeout = time + ((delete $arg{timeout}) || 60);
		2990
		2991	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2992
		2993	if (my $item = $self->{item}{$group}) {
		2994	if ($item->{text} eq $text) {
		2995	$item->{count}++;
		2996	} else {
		2997	$item->{count} = 1;
		2998	$item->{text} = $item->{tooltip} = $text;
		2999	}
		3000	$item->{id} = ++$self->{id};
		3001	$item->{timeout} = $timeout;
		3002	delete $item->{label};
		3003	} else {
		3004	$self->{item}{$group} = {
		3005	id => ++$self->{id},
		3006	text => $text,
		3007	timeout => $timeout,
		3008	tooltip => $text,
		3009	fg => [0.8, 0.8, 0.8, 0.8],
		3010	pri => 0,
		3011	count => 1,
		3012	%arg,
		3013	};
		3014	}
		3015
		3016	$self->reorder;
		3017	}
		3018
		3019	sub reconfigure {
		3020	my ($self) = @_;
		3021
		3022	delete $_->{label}
		3023	for values %{ $self->{item} || {} };
		3024
		3025	$self->reorder;
		3026	$self->SUPER::reconfigure;
2650	}	3027	}
2651		3028
2652	#############################################################################	3029	#############################################################################
2653		3030
2654	package CFClient::UI::Root;	3031	package CFClient::UI::Root;
…		…
2686	}	3063	}
2687		3064
2688	sub size_allocate {	3065	sub size_allocate {
2689	my ($self, $w, $h) = @_;	3066	my ($self, $w, $h) = @_;
2690		3067
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) {	3068	for my $child ($self->children) {
2708	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3069	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709		3070
		3071	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3072	if exists $child->{req_x};
		3073
		3074	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3075	if exists $child->{req_y};
		3076
2710	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3077	$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;	3078	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3079
2712	$child->configure ($X, $Y, $W, $H);	3080	$child->configure ($X, $Y, $W, $H);
2713	}	3081	}
2714
2715	$self->{old_w} = $w;
2716	$self->{old_h} = $h;
2717	}	3082	}
2718		3083
2719	sub coord2local {	3084	sub coord2local {
2720	my ($self, $x, $y) = @_;	3085	my ($self, $x, $y) = @_;
2721		3086
…		…
2734	$self->check_size;	3099	$self->check_size;
2735	$::WANT_REFRESH++;	3100	$::WANT_REFRESH++;
2736	}	3101	}
2737		3102
2738	sub add {	3103	sub add {
2739	my ($self, $child) = @_;	3104	my ($self, @children) = @_;
2740		3105
		3106	for (my @widgets = @children; my $w = pop @widgets; ) {
		3107	push @widgets, $w->children;
		3108	$w->{root} = $self;
		3109	$w->{visible} = 1;
		3110	}
		3111
		3112	for my $child (@children) {
		3113	$child->{is_toplevel} = 1;
		3114
2741	# integerise window positions	3115	# integerise window positions
2742	$child->{x} = int $child->{x};	3116	$child->{x} = int $child->{x};
2743	$child->{y} = int $child->{y};	3117	$child->{y} = int $child->{y};
		3118	}
2744		3119
2745	$self->SUPER::add ($child);	3120	$self->SUPER::add (@children);
		3121	}
		3122
		3123	sub remove {
		3124	my ($self, @children) = @_;
		3125
		3126	$self->SUPER::remove (@children);
		3127
		3128	while (@children) {
		3129	my $w = pop @children;
		3130	push @children, $w->children;
		3131	$w->set_invisible;
		3132	}
2746	}	3133	}
2747		3134
2748	sub on_refresh {	3135	sub on_refresh {
2749	my ($self, $id, $cb) = @_;	3136	my ($self, $id, $cb) = @_;
2750		3137
2751	$self->{refresh_hook}{$id} = $cb;	3138	$self->{refresh_hook}{$id} = $cb;
2752	}	3139	}
2753		3140
		3141	sub on_post_alloc {
		3142	my ($self, $id, $cb) = @_;
		3143
		3144	$self->{post_alloc_hook}{$id} = $cb;
		3145	}
		3146
2754	sub draw {	3147	sub draw {
2755	my ($self) = @_;	3148	my ($self) = @_;
		3149
		3150	while ($self->{refresh_hook}) {
		3151	$_->()
		3152	for values %{delete $self->{refresh_hook}};
		3153	}
2756		3154
2757	if ($self->{check_size}) {	3155	if ($self->{check_size}) {
2758	my @queue = ([], []);	3156	my @queue = ([], []);
2759		3157
2760	for (;;) {	3158	for (;;) {
…		…
2768		3166
2769	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3167	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770	? @$widget{qw(user_w user_h)}	3168	? @$widget{qw(user_w user_h)}
2771	: $widget->size_request;	3169	: $widget->size_request;
2772		3170
		3171	if (delete $widget->{force_alloc}
2773	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3172	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3173	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3174
2774	$widget->{req_w} = $w;	3175	$widget->{req_w} = $w;
2775	$widget->{req_h} = $h;	3176	$widget->{req_h} = $h;
2776		3177
2777	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3178	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2778		3179
2779	$widget->{parent}->check_size	3180	$widget->{parent}->check_size
2780	if $widget->{parent};	3181	if $widget->{parent};
2781	}	3182	}
2782	}	3183	}
…		…
2784		3185
2785	while ($self->{size_alloc}) {	3186	while ($self->{size_alloc}) {
2786	for (values %{delete $self->{size_alloc}}) {	3187	for (values %{delete $self->{size_alloc}}) {
2787	my ($widget, $w, $h) = @$_;	3188	my ($widget, $w, $h) = @$_;
2788		3189
		3190	$w = 0 if $w < 0;
		3191	$h = 0 if $h < 0;
		3192
2789	$widget->{w} = $w;	3193	$widget->{w} = $w;
2790	$widget->{h} = $h;	3194	$widget->{h} = $h;
2791	$widget->size_allocate ($w, $h);
2792	$widget->emit (size_allocate => $w, $h);	3195	$widget->emit (size_allocate => $w, $h);
2793	}	3196	}
2794	}	3197	}
2795		3198
2796	while ($self->{refresh_hook}) {	3199	while ($self->{post_alloc_hook}) {
2797	$_->()	3200	$_->()
2798	for values %{delete $self->{refresh_hook}};	3201	for values %{delete $self->{post_alloc_hook}};
2799	}	3202	}
2800		3203
2801	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3204	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3205	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803	glClear GL_COLOR_BUFFER_BIT;	3206	glClear GL_COLOR_BUFFER_BIT;
2804		3207
2805	glMatrixMode GL_PROJECTION;	3208	glMatrixMode GL_PROJECTION;
2806	glLoadIdentity;	3209	glLoadIdentity;
2807	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3210	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808	glMatrixMode GL_MODELVIEW;	3211	glMatrixMode GL_MODELVIEW;
2809	glLoadIdentity;	3212	glLoadIdentity;
2810		3213
2811	$self->_draw;	3214	$self->_draw;
2812	}	3215	}
…		…
2814	#############################################################################	3217	#############################################################################
2815		3218
2816	package CFClient::UI;	3219	package CFClient::UI;
2817		3220
2818	$ROOT = new CFClient::UI::Root;	3221	$ROOT = new CFClient::UI::Root;
2819	$TOOLTIP = new CFClient::UI::Tooltip;	3222	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820		3223
2821	1	3224	1
2822		3225

Diff Legend

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