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.239 by root, Thu May 25 22:29:57 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	$self->{root} = $parent->{root};
		464	$self->{visible} = $parent->{visible};
		465
		466	# TODO: req_w _does_change after ->reconfigure
		467	$self->check_size
		468	unless exists $self->{req_w};
		469
		470	$self->show;
387	}	471	}
388		472
389	sub check_size {	473	sub check_size {
390	my ($self) = @_;	474	my ($self, $forced) = @_;
391		475
		476	$self->{force_alloc} = 1 if $forced;
392	$CFClient::UI::ROOT->{check_size}{$self} = $self;	477	$CFClient::UI::ROOT->{check_size}{$self} = $self;
393	}	478	}
394		479
395	sub update {	480	sub update {
396	my ($self) = @_;	481	my ($self) = @_;
…		…
403	my ($self, $signal, $cb) = @_;	488	my ($self, $signal, $cb) = @_;
404		489
405	push @{ $self->{signal_cb}{$signal} }, $cb;	490	push @{ $self->{signal_cb}{$signal} }, $cb;
406	}	491	}
407		492
		493	sub _emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		497	}
		498
408	sub emit {	499	sub emit {
409	my ($self, $signal, @args) = @_;	500	my ($self, $signal, @args) = @_;
410		501
411	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	502	$self->_emit ($signal, @args)
		503	|| $self->$signal (@args);
412	}	504	}
413		505
414	sub DESTROY {	506	sub DESTROY {
415	my ($self) = @_;	507	my ($self) = @_;
416		508
		509	delete $WIDGET{$self+0};
417	#$self->deactivate;	510	#$self->deactivate;
418	}	511	}
419		512
420	#############################################################################	513	#############################################################################
421		514
…		…
430	my $class = shift;	523	my $class = shift;
431		524
432	# range [value, low, high, page]	525	# range [value, low, high, page]
433		526
434	$class->SUPER::new (	527	$class->SUPER::new (
435	bg => [0, 0, 0, 0.2],	528	#bg => [0, 0, 0, 0.2],
436	active_bg => [1, 1, 1, 0.5],	529	#active_bg => [1, 1, 1, 0.5],
437	@_	530	@_
438	)	531	)
439	}	532	}
440		533
441	sub _draw {	534	sub _draw {
442	my ($self) = @_;	535	my ($self) = @_;
443		536
		537	my $color = $FOCUS == $self && $self->{active_bg}
		538	? $self->{active_bg}
		539	: $self->{bg};
		540
		541	if ($color && (@$color < 4 || $color->[3])) {
444	my ($w, $h) = @$self{qw(w h)};	542	my ($w, $h) = @$self{qw(w h)};
445		543
446	glEnable GL_BLEND;	544	glEnable GL_BLEND;
447	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	545	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	546	glColor @$color;
449		547
450	glBegin GL_QUADS;	548	glBegin GL_QUADS;
451	glVertex 0 , 0;	549	glVertex 0 , 0;
452	glVertex 0 , $h;	550	glVertex 0 , $h;
453	glVertex $w, $h;	551	glVertex $w, $h;
454	glVertex $w, 0;	552	glVertex $w, 0;
455	glEnd;	553	glEnd;
456		554
457	glDisable GL_BLEND;	555	glDisable GL_BLEND;
		556	}
458	}	557	}
459		558
460	#############################################################################	559	#############################################################################
461		560
462	package CFClient::UI::Empty;	561	package CFClient::UI::Empty;
…		…
506	$self->{children} = [	605	$self->{children} = [
507	sort { $a->{z} <=> $b->{z} }	606	sort { $a->{z} <=> $b->{z} }
508	@{$self->{children}}, @widgets	607	@{$self->{children}}, @widgets
509	];	608	];
510		609
511	$_->check_size	610	$self->check_size (1);
512	for @widgets;
513
514	$self->update;	611	$self->update;
515	}	612	}
516		613
517	sub children {	614	sub children {
518	@{ $_[0]{children} }	615	@{ $_[0]{children} }
…		…
524	delete $child->{parent};	621	delete $child->{parent};
525	$child->hide;	622	$child->hide;
526		623
527	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	624	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528		625
529	$self->check_size;	626	$self->check_size (1);
530	$self->update;	627	$self->update;
531	}	628	}
532		629
533	sub clear {	630	sub clear {
534	my ($self) = @_;	631	my ($self) = @_;
…		…
625	}	722	}
626		723
627	sub update {	724	sub update {
628	my ($self) = @_;	725	my ($self) = @_;
629		726
630	$ROOT->on_refresh ($self => sub { $self->render_child });	727	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	728	$self->SUPER::update;
632	}	729	}
633		730
634	sub size_allocate {	731	sub size_allocate {
635	my ($self, $w, $h) = @_;	732	my ($self, $w, $h) = @_;
…		…
648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	745	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649	glClearColor 0, 0, 0, 0;	746	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	747	glClear GL_COLOR_BUFFER_BIT;
651		748
652	$self->_render;	749	$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	};	750	};
661	}	751	}
662		752
663	sub _draw {	753	sub _draw {
664	my ($self) = @_;	754	my ($self) = @_;
…		…
666	my ($w, $h) = ($self->w, $self->h);	756	my ($w, $h) = ($self->w, $self->h);
667		757
668	my $tex = $self->{texture}	758	my $tex = $self->{texture}
669	or return;	759	or return;
670		760
671	glEnable GL_BLEND;
672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	761	glEnable GL_TEXTURE_2D;
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	762	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675	glColor 0, 0, 0, 1;	763	glColor 1, 1, 1, 1;
676		764
677	$tex->draw_quad (0, 0, $w, $h);	765	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678		766
679	glDisable GL_BLEND;
680	glDisable GL_TEXTURE_2D;	767	glDisable GL_TEXTURE_2D;
681	}	768	}
682		769
683	#############################################################################	770	#############################################################################
684		771
685	package CFClient::UI::ViewPort;	772	package CFClient::UI::ViewPort;
686		773
687	our @ISA = CFClient::UI::Window::;	774	our @ISA = CFClient::UI::Window::;
688		775
		776	sub new {
		777	my $class = shift;
		778
		779	$class->SUPER::new (
		780	scroll_x => 0,
		781	scroll_y => 1,
		782	@_,
		783	)
		784	}
		785
689	sub size_request {	786	sub size_request {
690	my ($self) = @_;	787	my ($self) = @_;
691		788
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	789	@$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		790
695	@$self{qw(child_w child_h)}	791	@$self{qw(child_w child_h)}
696	}	792	}
697		793
698	sub size_allocate {	794	sub size_allocate {
699	my ($self, $w, $h) = @_;	795	my ($self, $w, $h) = @_;
700		796
		797	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		798	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		799
		800	$self->child->configure (0, 0, $w, $h);
701	$self->update;	801	$self->update;
702	}	802	}
703		803
704	sub set_offset {	804	sub set_offset {
705	my ($self, $x, $y) = @_;	805	my ($self, $x, $y) = @_;
…		…
759		859
760	my $slider = new CFClient::UI::Slider	860	my $slider = new CFClient::UI::Slider
761	vertical => 1,	861	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	862	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	863	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	864	$self->{vp}->set_offset (0, $_[1]);
765	},	865	},
766	;	866	;
767		867
768	$self = $class->SUPER::new (	868	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	869	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	870	slider => $slider,
771	@_,	871	@_,
772	);	872	);
773		873
774	$self->{vp}->add ($self->{scrolled});	874	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	876	$self->add ($self->{slider});
777		877
778	$self	878	$self
779	}	879	}
780		880
		881	sub update {
		882	my ($self) = @_;
		883
		884	$self->SUPER::update;
		885
		886	# todo: overwrite size_allocate of child
		887	my $child = $self->{vp}->child;
		888	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		889	}
		890
		891	sub size_allocate {
		892	my ($self, $w, $h) = @_;
		893
		894	$self->SUPER::size_allocate ($w, $h);
		895
		896	my $child = $self->{vp}->child;
		897	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		898	}
		899
781	#TODO# update range on size_allocate depeneing on child	900	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	901	# update viewport offset on scroll
783		902
784	#############################################################################	903	#############################################################################
785		904
786	package CFClient::UI::Frame;	905	package CFClient::UI::Frame;
…		…
790	use CFClient::OpenGL;	909	use CFClient::OpenGL;
791		910
792	sub new {	911	sub new {
793	my $class = shift;	912	my $class = shift;
794		913
795	my $self = $class->SUPER::new (	914	$class->SUPER::new (
796	bg => [1, 1, 1, 1],	915	bg => undef,
797	border_bg => [1, 1, 1, 1],
798	border => 0.8,
799	@_	916	@_,
800	);	917	)
801
802	$self
803	}	918	}
804		919
805	sub _draw {	920	sub _draw {
806	my ($self) = @_;	921	my ($self) = @_;
807		922
808	my ($w, $h) = ($self->{w}, $self->{h});	923	if ($self->{bg}) {
		924	my ($w, $h) = @$self{qw(w h)};
809		925
810	glEnable GL_BLEND;	926	glEnable GL_BLEND;
811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	927	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812	glEnable GL_TEXTURE_2D;	928	glColor @{ $self->{bg} };
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814		929
815	# glBegin GL_QUADS;	930	glBegin GL_QUADS;
816	# glColor 0, 0, 0, 0;
817	# glVertex 0 , 0;	931	glVertex 0 , 0;
818	# glVertex 0 , $h;	932	glVertex 0 , $h;
819	# glVertex $w, $h;	933	glVertex $w, $h;
820	# glVertex $w, 0;	934	glVertex $w, 0;
821	# glEnd;	935	glEnd;
822		936
823
824	$self->child->draw;
825	glDisable GL_BLEND;	937	glDisable GL_BLEND;
826	glDisable GL_TEXTURE_2D;	938	}
		939
		940	$self->SUPER::_draw;
827	}	941	}
828		942
829	#############################################################################	943	#############################################################################
830		944
831	package CFClient::UI::FancyFrame;	945	package CFClient::UI::FancyFrame;
…		…
842	my $class = shift;	956	my $class = shift;
843		957
844	# TODO: user_x, user_y, overwrite moveto?	958	# TODO: user_x, user_y, overwrite moveto?
845		959
846	my $self = $class->SUPER::new (	960	my $self = $class->SUPER::new (
847	bg => [1, 1, 1, 1],	961	bg => [1, 1, 1, 1],
848	border_bg => [1, 1, 1, 1],	962	border_bg => [1, 1, 1, 1],
849	border => 0.6,	963	border => 0.6,
		964	is_toplevel => 1,
850	can_events => 1,	965	can_events => 1,
851	@_	966	@_
852	);	967	);
853		968
854	$self->{title} &&= new CFClient::UI::Label	969	$self->{title} &&= new CFClient::UI::Label
855	align => 0,	970	align => 0,
…		…
879	my ($self, $w, $h) = @_;	994	my ($self, $w, $h) = @_;
880		995
881	$h -= List::Util::max 0, $self->border * 2;	996	$h -= List::Util::max 0, $self->border * 2;
882	$w -= List::Util::max 0, $self->border * 2;	997	$w -= List::Util::max 0, $self->border * 2;
883		998
884	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	999	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885	if $self->{title};	1000	if $self->{title};
886		1001
887	$self->child->configure ($self->border, $self->border, $w, $h);	1002	$self->child->configure ($self->border, $self->border, $w, $h);
888	}	1003	}
889		1004
…		…
947	my ($self) = @_;	1062	my ($self) = @_;
948		1063
949	my ($w, $h ) = ($self->{w}, $self->{h});	1064	my ($w, $h ) = ($self->{w}, $self->{h});
950	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1065	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951		1066
952	glEnable GL_BLEND;
953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954	glEnable GL_TEXTURE_2D;	1067	glEnable GL_TEXTURE_2D;
955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1068	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956		1069
957	my $border = $self->border;	1070	my $border = $self->border;
958		1071
959	glColor @{ $self->{border_bg} };	1072	glColor @{ $self->{border_bg} };
960	$tex[1]->draw_quad (0, 0, $w, $border);	1073	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
961	$tex[3]->draw_quad (0, $border, $border, $ch);	1074	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1075	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1076	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964		1077
965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1078	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966	my $bg = $tex[0];	1079	my $bg = $tex[0];
967		1080
968	# TODO: repeat texture not scale	1081	# TODO: repeat texture not scale
…		…
972	glColor @{ $self->{bg} };	1085	glColor @{ $self->{bg} };
973		1086
974	$bg->{s} = $rep_x;	1087	$bg->{s} = $rep_x;
975	$bg->{t} = $rep_y;	1088	$bg->{t} = $rep_y;
976	$bg->{wrap_mode} = 1;	1089	$bg->{wrap_mode} = 1;
977	$bg->draw_quad ($border, $border, $cw, $ch);	1090	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1091	}
978		1092
979	glDisable GL_TEXTURE_2D;	1093	glDisable GL_TEXTURE_2D;
980	glDisable GL_BLEND;
981	}
982		1094
983	$self->{title}->draw if $self->{title};	1095	$self->{title}->draw if $self->{title};
984		1096
985	$self->child->draw;	1097	$self->child->draw;
986	}	1098	}
…		…
998	sub new {	1110	sub new {
999	my $class = shift;	1111	my $class = shift;
1000		1112
1001	$class->SUPER::new (	1113	$class->SUPER::new (
1002	col_expand => [],	1114	col_expand => [],
1003	@_	1115	@_,
1004	)	1116	)
		1117	}
		1118
		1119	sub children {
		1120	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005	}	1121	}
1006		1122
1007	sub add {	1123	sub add {
1008	my ($self, $x, $y, $child) = @_;	1124	my ($self, $x, $y, $child) = @_;
1009		1125
1010	$child->set_parent ($self);	1126	$child->set_parent ($self);
1011	$self->{children}[$y][$x] = $child;	1127	$self->{children}[$y][$x] = $child;
1012		1128
1013	$child->check_size;	1129	$self->check_size (1);
1014	}	1130	}
1015		1131
1016	sub children {
1017	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018	}
1019
1020	# TODO: move to container class maybe? send childs a signal on removal?	1132	# TODO: move to container class maybe? send children a signal on removal?
1021	sub clear {	1133	sub clear {
1022	my ($self) = @_;	1134	my ($self) = @_;
1023		1135
1024	my @children = $self->children;	1136	my @children = $self->children;
1025	delete $self->{children};	1137	delete $self->{children};
…		…
1027	for (@children) {	1139	for (@children) {
1028	delete $_->{parent};	1140	delete $_->{parent};
1029	$_->hide;	1141	$_->hide;
1030	}	1142	}
1031		1143
		1144	$self->check_size (1);
1032	$self->update;	1145	$self->update;
1033	}	1146	}
1034		1147
1035	sub get_wh {	1148	sub get_wh {
1036	my ($self) = @_;	1149	my ($self) = @_;
…		…
1068	sub size_allocate {	1181	sub size_allocate {
1069	my ($self, $w, $h) = @_;	1182	my ($self, $w, $h) = @_;
1070		1183
1071	my ($ws, $hs) = $self->get_wh;	1184	my ($ws, $hs) = $self->get_wh;
1072		1185
1073	my $req_w = sum @$ws;	1186	my $req_w = (sum @$ws) || 1;
1074	my $req_h = sum @$hs;	1187	my $req_h = (sum @$hs) || 1;
1075		1188
1076	# TODO: nicer code && do row_expand	1189	# TODO: nicer code && do row_expand
1077	my @col_expand = @{$self->{col_expand}};	1190	my @col_expand = @{$self->{col_expand}};
1078	@col_expand = (1) x @$ws unless @col_expand;	1191	@col_expand = (1) x @$ws unless @col_expand;
1079	my $col_expand = (sum @col_expand) || 1;	1192	my $col_expand = (sum @col_expand) || 1;
…		…
1213	}	1326	}
1214		1327
1215	sub size_allocate {	1328	sub size_allocate {
1216	my ($self, $w, $h) = @_;	1329	my ($self, $w, $h) = @_;
1217		1330
		1331	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1332
1218	my $children = $self->{children};	1333	my $children = $self->{children};
1219		1334
1220	my @h = map $_->{req_h}, @$children;	1335	my @h = map $_->{req_h}, @$children;
1221		1336
1222	my $req_h = List::Util::sum @h;	1337	my $req_h = List::Util::sum @h;
…		…
1251		1366
1252	#############################################################################	1367	#############################################################################
1253		1368
1254	package CFClient::UI::Label;	1369	package CFClient::UI::Label;
1255		1370
1256	our @ISA = CFClient::UI::Base::;	1371	our @ISA = CFClient::UI::DrawBG::;
1257		1372
1258	use CFClient::OpenGL;	1373	use CFClient::OpenGL;
1259		1374
1260	sub new {	1375	sub new {
1261	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1262		1377
1263	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
1264	fg => [1, 1, 1],	1379	fg => [1, 1, 1],
		1380	#bg => none
		1381	#active_bg => none
1265	#font => default_font	1382	#font => default_font
		1383	#text => initial text
		1384	#markup => initial narkup
		1385	#max_w => maximum pixel width
		1386	ellipsise => 3, # end
		1387	layout => (new CFClient::Layout),
1266	fontsize => 1,	1388	fontsize => 1,
1267	text => "",
1268	align => -1,	1389	align => -1,
1269	valign => -1,	1390	valign => -1,
1270	padding => 2,	1391	padding => 2,
1271	layout => new CFClient::Layout,
1272	can_events => 0,	1392	can_events => 0,
1273	%arg	1393	%arg
1274	);	1394	);
1275		1395
1276	if (exists $self->{template}) {	1396	if (exists $self->{template}) {
1277	my $layout = new CFClient::Layout;	1397	my $layout = new CFClient::Layout;
1278	$layout->set_text (delete $self->{template});	1398	$layout->set_text (delete $self->{template});
1279	$self->{template} = $layout;	1399	$self->{template} = $layout;
1280	}	1400	}
1281		1401
1282	$self->set_text (delete $self->{text}) if exists $self->{text};	1402	if (exists $self->{markup}) {
1283	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1403	$self->set_markup (delete $self->{markup});
		1404	} else {
		1405	$self->set_text (delete $self->{text});
		1406	}
1284		1407
1285	$self	1408	$self
1286	}	1409	}
1287		1410
1288	sub escape {	1411	sub escape($) {
1289	local $_ = $_[1];	1412	local $_ = $_[0];
1290		1413
1291	s/&/&amp;/g;	1414	s/&/&amp;/g;
1292	s/>/&gt;/g;	1415	s/>/&gt;/g;
1293	s/</&lt;/g;	1416	s/</&lt;/g;
1294		1417
1295	$_[1]	1418	$_
1296	}	1419	}
1297		1420
1298	sub update {	1421	sub update {
1299	my ($self) = @_;	1422	my ($self) = @_;
1300		1423
…		…
1306	my ($self, $text) = @_;	1429	my ($self, $text) = @_;
1307		1430
1308	return if $self->{text} eq "T$text";	1431	return if $self->{text} eq "T$text";
1309	$self->{text} = "T$text";	1432	$self->{text} = "T$text";
1310		1433
		1434	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311	$self->{layout}->set_text ($text);	1435	$self->{layout}->set_text ($text);
1312		1436
1313	$self->update;	1437	$self->update;
1314	$self->check_size;	1438	$self->check_size;
1315	}	1439	}
…		…
1318	my ($self, $markup) = @_;	1442	my ($self, $markup) = @_;
1319		1443
1320	return if $self->{text} eq "M$markup";	1444	return if $self->{text} eq "M$markup";
1321	$self->{text} = "M$markup";	1445	$self->{text} = "M$markup";
1322		1446
		1447	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1448
		1449	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323	$self->{layout}->set_markup ($markup);	1450	$self->{layout}->set_markup ($markup);
1324		1451
1325	$self->update;	1452	$self->update;
1326	$self->check_size;	1453	$self->check_size;
1327	}	1454	}
…		…
1329	sub size_request {	1456	sub size_request {
1330	my ($self) = @_;	1457	my ($self) = @_;
1331		1458
1332	$self->{layout}->set_font ($self->{font}) if $self->{font};	1459	$self->{layout}->set_font ($self->{font}) if $self->{font};
1333	$self->{layout}->set_width ($self->{max_w} || -1);	1460	$self->{layout}->set_width ($self->{max_w} || -1);
		1461	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1462	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1334	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1463	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335		1464
1336	my ($w, $h) = $self->{layout}->size;	1465	my ($w, $h) = $self->{layout}->size;
1337		1466
1338	if (exists $self->{template}) {	1467	if (exists $self->{template}) {
…		…
1368	}	1497	}
1369		1498
1370	sub _draw {	1499	sub _draw {
1371	my ($self) = @_;	1500	my ($self) = @_;
1372		1501
		1502	$self->SUPER::_draw; # draw background, if applicable
		1503
1373	my $tex = $self->{texture} ||= do {	1504	my $tex = $self->{texture} ||= do {
		1505	$self->{layout}->set_foreground (@{$self->{fg}});
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1506	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$self->{layout}->set_width ($self->{w});	1507	$self->{layout}->set_width ($self->{w});
		1508	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1509	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1510	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1511
1377	new_from_layout CFClient::Texture $self->{layout}	1512	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1513
		1514	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1515	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1516	: ($self->{w} - $tex->{w}) * 0.5);
		1517
		1518	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1519	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1520	: ($self->{h} - $tex->{h}) * 0.5);
		1521
		1522	$tex
1378	};	1523	};
1379		1524
1380	glEnable GL_BLEND;
1381	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382	glEnable GL_TEXTURE_2D;	1525	glEnable GL_TEXTURE_2D;
1383	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1526	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384		1527
		1528	if ($tex->{format} == GL_ALPHA) {
1385	glColor @{$self->{fg}};	1529	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});	1530	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1531	} else {
		1532	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1533	}
1400		1534
1401	glDisable GL_TEXTURE_2D;	1535	glDisable GL_TEXTURE_2D;
1402	glDisable GL_BLEND;
1403	}	1536	}
1404		1537
1405	#############################################################################	1538	#############################################################################
1406		1539
1407	package CFClient::UI::EntryBase;	1540	package CFClient::UI::EntryBase;
…		…
1420	active_fg => [0, 0, 0],	1553	active_fg => [0, 0, 0],
1421	can_hover => 1,	1554	can_hover => 1,
1422	can_focus => 1,	1555	can_focus => 1,
1423	valign => 0,	1556	valign => 0,
1424	can_events => 1,	1557	can_events => 1,
		1558	#text => ...
1425	@_	1559	@_
1426	)	1560	)
1427	}	1561	}
1428		1562
1429	sub _set_text {	1563	sub _set_text {
…		…
1439	$self->{text} = $text;	1573	$self->{text} = $text;
1440		1574
1441	$text =~ s/./*/g if $self->{hidden};	1575	$text =~ s/./*/g if $self->{hidden};
1442	$self->{layout}->set_text ("$text ");	1576	$self->{layout}->set_text ("$text ");
1443		1577
1444	$self->emit (changed => $self->{text});	1578	$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	}	1579	}
1464		1580
1465	sub set_text {	1581	sub set_text {
1466	my ($self, $text) = @_;	1582	my ($self, $text) = @_;
1467		1583
1468	$self->{cursor} = length $text;	1584	$self->{cursor} = length $text;
1469	$self->_set_text ($text);	1585	$self->_set_text ($text);
1470	$self->update;	1586	$self->update;
		1587	$self->check_size;
		1588	}
		1589
		1590	sub get_text {
		1591	$_[0]{text}
		1592	}
		1593
		1594	sub size_request {
		1595	my ($self) = @_;
		1596
		1597	my ($w, $h) = $self->SUPER::size_request;
		1598
		1599	($w + 1, $h) # add 1 for cursor
1471	}	1600	}
1472		1601
1473	sub key_down {	1602	sub key_down {
1474	my ($self, $ev) = @_;	1603	my ($self, $ev) = @_;
1475		1604
…		…
1477	my $sym = $ev->{sym};	1606	my $sym = $ev->{sym};
1478	my $uni = $ev->{unicode};	1607	my $uni = $ev->{unicode};
1479		1608
1480	my $text = $self->get_text;	1609	my $text = $self->get_text;
1481		1610
1482	if ($sym == 8) {	1611	if ($uni == 8) {
1483	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1612	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484	} elsif ($sym == 127) {	1613	} elsif ($uni == 127) {
1485	substr $text, $self->{cursor}, 1, "";	1614	substr $text, $self->{cursor}, 1, "";
1486	} elsif ($sym == CFClient::SDLK_LEFT) {	1615	} elsif ($sym == CFClient::SDLK_LEFT) {
1487	--$self->{cursor} if $self->{cursor};	1616	--$self->{cursor} if $self->{cursor};
1488	} elsif ($sym == CFClient::SDLK_RIGHT) {	1617	} elsif ($sym == CFClient::SDLK_RIGHT) {
1489	++$self->{cursor} if $self->{cursor} < length $self->{text};	1618	++$self->{cursor} if $self->{cursor} < length $self->{text};
1490	} elsif ($sym == CFClient::SDLK_HOME) {	1619	} elsif ($sym == CFClient::SDLK_HOME) {
1491	$self->{cursor} = 0;	1620	$self->{cursor} = 0;
1492	} elsif ($sym == CFClient::SDLK_END) {	1621	} elsif ($sym == CFClient::SDLK_END) {
1493	$self->{cursor} = length $text;	1622	$self->{cursor} = length $text;
1494	} elsif ($sym == 27) {	1623	} elsif ($uni == 27) {
1495	$self->emit ('escape');	1624	$self->_emit ('escape');
1496	} elsif ($uni) {	1625	} elsif ($uni) {
1497	substr $text, $self->{cursor}++, 0, chr $uni;	1626	substr $text, $self->{cursor}++, 0, chr $uni;
1498	}	1627	}
1499		1628
1500	$self->_set_text ($text);	1629	$self->_set_text ($text);
1501	$self->update;	1630	$self->update;
		1631	$self->check_size;
1502	}	1632	}
1503		1633
1504	sub focus_in {	1634	sub focus_in {
1505	my ($self) = @_;	1635	my ($self) = @_;
1506		1636
…		…
1586	if ($sym == 13) {	1716	if ($sym == 13) {
1587	unshift @{$self->{history}},	1717	unshift @{$self->{history}},
1588	my $txt = $self->get_text;	1718	my $txt = $self->get_text;
1589	$self->{history_pointer} = -1;	1719	$self->{history_pointer} = -1;
1590	$self->{history_saveback} = '';	1720	$self->{history_saveback} = '';
1591	$self->emit (activate => $txt);	1721	$self->_emit (activate => $txt);
1592	$self->update;	1722	$self->update;
1593		1723
1594	} elsif ($sym == CFClient::SDLK_UP) {	1724	} elsif ($sym == CFClient::SDLK_UP) {
1595	if ($self->{history_pointer} < 0) {	1725	if ($self->{history_pointer} < 0) {
1596	$self->{history_saveback} = $self->get_text;	1726	$self->{history_saveback} = $self->get_text;
…		…
1635	my $class = shift;	1765	my $class = shift;
1636		1766
1637	$class->SUPER::new (	1767	$class->SUPER::new (
1638	padding => 4,	1768	padding => 4,
1639	fg => [1, 1, 1],	1769	fg => [1, 1, 1],
1640	bg => [1, 1, 1, 0.2],
1641	active_fg => [0, 0, 1],	1770	active_fg => [0, 0, 1],
1642	can_hover => 1,	1771	can_hover => 1,
1643	align => 0,	1772	align => 0,
1644	valign => 0,	1773	valign => 0,
1645	can_events => 1,	1774	can_events => 1,
1646	@_	1775	@_
1647	)	1776	)
1648	}	1777	}
1649		1778
		1779	sub activate { }
		1780
1650	sub button_up {	1781	sub button_up {
1651	my ($self, $ev, $x, $y) = @_;	1782	my ($self, $ev, $x, $y) = @_;
1652		1783
		1784	$self->emit ("activate")
1653	if ($x >= 0 && $x < $self->{w}	1785	if $x >= 0 && $x < $self->{w}
1654	&& $y >= 0 && $y < $self->{h}) {	1786	&& $y >= 0 && $y < $self->{h};
1655	$self->emit ("activate");
1656	}
1657	}	1787	}
1658		1788
1659	sub _draw {	1789	sub _draw {
1660	my ($self) = @_;	1790	my ($self) = @_;
1661		1791
…		…
1663		1793
1664	if ($GRAB == $self) {	1794	if ($GRAB == $self) {
1665	$self->{fg} = $self->{active_fg};	1795	$self->{fg} = $self->{active_fg};
1666	}	1796	}
1667		1797
1668	glEnable GL_BLEND;
1669	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670	glEnable GL_TEXTURE_2D;	1798	glEnable GL_TEXTURE_2D;
1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672	glColor 0, 0, 0, 1;	1800	glColor 0, 0, 0, 1;
1673		1801
1674	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1802	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675		1803
1676	glDisable GL_TEXTURE_2D;	1804	glDisable GL_TEXTURE_2D;
1677	glDisable GL_BLEND;
1678		1805
1679	$self->SUPER::_draw;	1806	$self->SUPER::_draw;
1680	}	1807	}
1681		1808
1682	#############################################################################	1809	#############################################################################
…		…
1696		1823
1697	$class->SUPER::new (	1824	$class->SUPER::new (
1698	padding => 2,	1825	padding => 2,
1699	fg => [1, 1, 1],	1826	fg => [1, 1, 1],
1700	active_fg => [1, 1, 0],	1827	active_fg => [1, 1, 0],
		1828	bg => [0, 0, 0, 0.2],
		1829	active_bg => [1, 1, 1, 0.5],
1701	state => 0,	1830	state => 0,
1702	can_hover => 1,	1831	can_hover => 1,
1703	@_	1832	@_
1704	)	1833	)
1705	}	1834	}
…		…
1714	my ($self, $ev, $x, $y) = @_;	1843	my ($self, $ev, $x, $y) = @_;
1715		1844
1716	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1845	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1846	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718	$self->{state} = !$self->{state};	1847	$self->{state} = !$self->{state};
1719	$self->emit (changed => $self->{state});	1848	$self->_emit (changed => $self->{state});
1720	}	1849	}
1721	}	1850	}
1722		1851
1723	sub _draw {	1852	sub _draw {
1724	my ($self) = @_;	1853	my ($self) = @_;
…		…
1729		1858
1730	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1859	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731		1860
1732	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1861	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733		1862
1734	glEnable GL_BLEND;	1863	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1864
1735	glEnable GL_TEXTURE_2D;	1865	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);	1866	$tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742	glDisable GL_TEXTURE_2D;	1867	glDisable GL_TEXTURE_2D;
1743	glDisable GL_BLEND;
1744	}	1868	}
1745		1869
1746	#############################################################################	1870	#############################################################################
1747		1871
1748	package CFClient::UI::Image;	1872	package CFClient::UI::Image;
…		…
1791	glTranslate 0, -$self->{w}, 0;	1915	glTranslate 0, -$self->{w}, 0;
1792		1916
1793	($w, $h) = ($h, $w);	1917	($w, $h) = ($h, $w);
1794	}	1918	}
1795		1919
1796	glEnable GL_BLEND;
1797	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798	glEnable GL_TEXTURE_2D;	1920	glEnable GL_TEXTURE_2D;
1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1921	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800		1922
1801	$tex->draw_quad (0, 0, $w, $h);	1923	$tex->draw_quad_alpha (0, 0, $w, $h);
1802		1924
1803	glDisable GL_BLEND;
1804	glDisable GL_TEXTURE_2D;	1925	glDisable GL_TEXTURE_2D;
1805	}	1926	}
1806		1927
1807	#############################################################################	1928	#############################################################################
1808		1929
…		…
1997	qw(s1_slider.png s1_slider_bg.png);	2118	qw(s1_slider.png s1_slider_bg.png);
1998		2119
1999	sub new {	2120	sub new {
2000	my $class = shift;	2121	my $class = shift;
2001		2122
2002	# range [value, low, high, page]	2123	# range [value, low, high, page, unit]
2003		2124
2004	# TODO: 0-width page	2125	# TODO: 0-width page
2005	# TODO: req_w/h are wrong with vertical	2126	# TODO: req_w/h are wrong with vertical
2006	# TODO: calculations are off	2127	# TODO: calculations are off
2007	my $self = $class->SUPER::new (	2128	my $self = $class->SUPER::new (
2008	fg => [1, 1, 1],	2129	fg => [1, 1, 1],
2009	active_fg => [0, 0, 0],	2130	active_fg => [0, 0, 0],
		2131	bg => [0, 0, 0, 0.2],
		2132	active_bg => [1, 1, 1, 0.5],
2010	range => [0, 0, 100, 10],	2133	range => [0, 0, 100, 10, 0],
2011	req_w => $::WIDTH / 80,	2134	req_w => $::WIDTH / 80,
2012	req_h => $::WIDTH / 80,	2135	req_h => $::WIDTH / 80,
2013	vertical => 0,	2136	vertical => 0,
2014	can_hover => 1,	2137	can_hover => 1,
2015	inner_pad => 5,	2138	inner_pad => 0.02,
2016	@_	2139	@_
2017	);	2140	);
2018		2141
		2142	$self->set_value ($self->{range}[0]);
		2143	$self->update;
		2144
2019	$self	2145	$self
		2146	}
		2147
		2148	sub set_range {
		2149	my ($self, $range) = @_;
		2150
		2151	($range, $self->{range}) = ($self->{range}, $range);
		2152
		2153	$self->update
		2154	if "@$range" ne "@{$self->{range}}";
		2155	}
		2156
		2157	sub set_value {
		2158	my ($self, $value) = @_;
		2159
		2160	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2161
		2162	$hi = $lo + 1 if $hi <= $lo;
		2163
		2164	$page = $hi - $lo if $page > $hi - $lo;
		2165
		2166	$value = $lo if $value < $lo;
		2167	$value = $hi - $page if $value > $hi - $page;
		2168
		2169	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2170	if $unit;
		2171
		2172	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2173
		2174	if ($value != $old_value) {
		2175	$self->_emit (changed => $value);
		2176	$self->update;
		2177	}
2020	}	2178	}
2021		2179
2022	sub size_request {	2180	sub size_request {
2023	my ($self) = @_;	2181	my ($self) = @_;
2024		2182
…		…
2030		2188
2031	sub button_down {	2189	sub button_down {
2032	my ($self, $ev, $x, $y) = @_;	2190	my ($self, $ev, $x, $y) = @_;
2033		2191
2034	$self->SUPER::button_down ($ev, $x, $y);	2192	$self->SUPER::button_down ($ev, $x, $y);
		2193
		2194	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2195
2035	$self->mouse_motion ($ev, $x, $y);	2196	$self->mouse_motion ($ev, $x, $y);
2036	}	2197	}
2037		2198
2038	sub mouse_motion {	2199	sub mouse_motion {
2039	my ($self, $ev, $x, $y) = @_;	2200	my ($self, $ev, $x, $y) = @_;
2040		2201
2041	if ($GRAB == $self) {	2202	if ($GRAB == $self) {
		2203	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2204
		2205	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2206
		2207	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2208
		2209	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2210	}
		2211	}
		2212
		2213	sub update {
		2214	my ($self) = @_;
		2215
		2216	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2217	$self->set_value ($self->{range}[0]);
		2218
2042	my ($value, $lo, $hi, $page) = @{$self->{range}};	2219	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2220	my $range = ($hi - $page - $lo) || 1e-100;
2043		2221
2044	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2222	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045		2223
2046	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2224	$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	2225	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048		2226
2049	$x -= $inner_pad_px; # substract the padding	2227	$value = ($value - $lo) / $range;
2050	$x = $x * ($hi - $lo) / $inner_w + $lo;	2228	$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		2229
2055	$self->emit (changed => $x);	2230	$self->{knob_x} = $value - $knob_w * 0.5;
2056	$self->update;	2231	$self->{knob_w} = $knob_w;
2057	}	2232	});
2058	}
2059		2233
2060	# the inner_* stuff is for generating a padding for the slider handle,	2234	$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	}	2235	}
2067		2236
2068	sub _draw {	2237	sub _draw {
2069	my ($self) = @_;	2238	my ($self) = @_;
2070		2239
2071	$self->SUPER::_draw ();	2240	$self->SUPER::_draw ();
2072		2241
2073	my ($w, $h) = @$self{qw(w h)};	2242	glScale $self->{w}, $self->{h};
2074		2243
2075	if ($self->{vertical}) {	2244	if ($self->{vertical}) {
2076	# draw a vertical slider like a rotated horizontal slider	2245	# draw a vertical slider like a rotated horizontal slider
2077		2246
		2247	glTranslate 1, 0, 0;
2078	glRotate 90, 0, 0, 1;	2248	glRotate 90, 0, 0, 1;
2079	glTranslate 0, -$self->{w}, 0;
2080
2081	($w, $h) = ($h, $w);
2082	}	2249	}
2083		2250
2084	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2251	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2252	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086		2253
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;	2254	glEnable GL_TEXTURE_2D;
2108	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2255	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109		2256
2110	# draw background	2257	# draw background
2111	$tex[1]->draw_quad (0, 0, $w, $h);	2258	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112		2259
2113	# draw handle	2260	# draw handle
2114	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2261	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115		2262
2116	glDisable GL_BLEND;
2117	glDisable GL_TEXTURE_2D;	2263	glDisable GL_TEXTURE_2D;
2118	}	2264	}
		2265
		2266	#############################################################################
		2267
		2268	package CFClient::UI::ValSlider;
		2269
		2270	our @ISA = CFClient::UI::HBox::;
		2271
		2272	sub new {
		2273	my ($class, %arg) = @_;
		2274
		2275	my $range = delete $arg{range};
		2276
		2277	my $self = $class->SUPER::new (
		2278	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2279	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2280	to_value => sub { shift },
		2281	from_value => sub { shift },
		2282	%arg,
		2283	);
		2284
		2285	$self->{slider}->connect (changed => sub {
		2286	my ($self, $value) = @_;
		2287	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2288	$self->{parent}->emit (changed => $value);
		2289	});
		2290
		2291	# $self->{entry}->connect (changed => sub {
		2292	# my ($self, $value) = @_;
		2293	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2294	# $self->{parent}->emit (changed => $value);
		2295	# });
		2296
		2297	$self->add ($self->{slider}, $self->{entry});
		2298
		2299	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2300
		2301	$self
		2302	}
		2303
		2304	sub set_range { shift->{slider}->set_range (@_) }
		2305	sub set_value { shift->{slider}->set_value (@_) }
2119		2306
2120	#############################################################################	2307	#############################################################################
2121		2308
2122	package CFClient::UI::TextView;	2309	package CFClient::UI::TextView;
2123		2310
…		…
2132	fontsize => 1,	2319	fontsize => 1,
2133	can_events => 0,	2320	can_events => 0,
2134	#font => default_font	2321	#font => default_font
2135	@_,	2322	@_,
2136		2323
2137	layout => (new CFClient::Layout),	2324	layout => (new CFClient::Layout 1),
2138	par => [],	2325	par => [],
2139	height => 0,	2326	height => 0,
2140	children => [	2327	children => [
2141	(new CFClient::UI::Empty expand => 1),	2328	(new CFClient::UI::Empty expand => 1),
2142	(new CFClient::UI::Slider vertical => 1),	2329	(new CFClient::UI::Slider vertical => 1),
…		…
2153		2340
2154	$self->{fontsize} = $fontsize;	2341	$self->{fontsize} = $fontsize;
2155	$self->reflow;	2342	$self->reflow;
2156	}	2343	}
2157		2344
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 {	2345	sub size_allocate {
2178	my ($self, $w, $h) = @_;	2346	my ($self, $w, $h) = @_;
2179		2347
2180	$self->SUPER::size_allocate ($w, $h);	2348	$self->SUPER::size_allocate ($w, $h);
2181		2349
…		…
2184	$self->{layout}->set_width ($self->{children}[0]{w});	2352	$self->{layout}->set_width ($self->{children}[0]{w});
2185		2353
2186	$self->reflow;	2354	$self->reflow;
2187	}	2355	}
2188		2356
		2357	sub text_size {
		2358	my ($self, $text, $indent) = @_;
		2359
		2360	my $layout = $self->{layout};
		2361
		2362	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2363	$layout->set_width ($self->{children}[0]{w} - $indent);
		2364	$layout->set_markup ($text);
		2365
		2366	$layout->size
		2367	}
		2368
		2369	sub reflow {
		2370	my ($self) = @_;
		2371
		2372	$self->{need_reflow}++;
		2373	$self->update;
		2374	}
		2375
		2376	sub set_offset {
		2377	my ($self, $offset) = @_;
		2378
		2379	# todo: base offset on lines or so, not on pixels
		2380	$self->{children}[1]->set_value ($offset);
		2381	}
		2382
		2383	sub clear {
		2384	my ($self) = @_;
		2385
		2386	$self->{par} = [];
		2387	$self->{height} = 0;
		2388	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2389	}
		2390
2189	sub add_paragraph {	2391	sub add_paragraph {
2190	my ($self, $color, $text) = @_;	2392	my ($self, $color, $text, $indent) = @_;
2191		2393
2192	#TODO: intelligently "reformat" paragraph	2394	for my $line (split /\n/, $text) {
2193		2395	my ($w, $h) = $self->text_size ($line);
2194	my $height = $self->text_height ($text);
2195
2196	$self->{height} += $height;	2396	$self->{height} += $h;
		2397	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2398	}
2197		2399
2198	push @{$self->{par}}, [$height, $color, $text];
2199
2200	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2400	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2201	$self->{children}[1]->update;
2202	}	2401	}
2203		2402
2204	sub update {	2403	sub update {
2205	my ($self) = @_;	2404	my ($self) = @_;
2206		2405
…		…
2208		2407
2209	return unless $self->{h} > 0;	2408	return unless $self->{h} > 0;
2210		2409
2211	delete $self->{texture};	2410	delete $self->{texture};
2212		2411
2213	$ROOT->on_refresh ($self, sub {	2412	$ROOT->on_post_alloc ($self, sub {
		2413	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2414
2214	if (delete $self->{need_reflow}) {	2415	if (delete $self->{need_reflow}) {
2215	my $height = 0;	2416	my $height = 0;
2216		2417
2217	$height += $_->[0] = $self->text_height ($_->[2])	2418	my $layout = $self->{layout};
		2419
		2420	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2421
2218	for @{$self->{par}};	2422	for (@{$self->{par}}) {
		2423	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2424	$layout->set_width ($W - $_->[3]);
		2425	$layout->set_markup ($_->[4]);
		2426	my ($w, $h) = $layout->size;
		2427	$_->[0] = $w + $_->[3];
		2428	$_->[1] = $h;
		2429	}
		2430
		2431	$height += $_->[1];
		2432	}
2219		2433
2220	$self->{height} = $height;	2434	$self->{height} = $height;
2221		2435
2222	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2436	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2223		2437
2224	delete $self->{texture};	2438	delete $self->{texture};
2225	}	2439	}
2226		2440
2227	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2441	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2228	glClearColor 0, 0, 0, 0;	2442	glClearColor 0.5, 0.5, 0.5, 0;
2229	glClear GL_COLOR_BUFFER_BIT;	2443	glClear GL_COLOR_BUFFER_BIT;
2230		2444
		2445	my $top = int $self->{children}[1]{range}[0];
		2446
		2447	my $y0 = $top;
		2448	my $y1 = $top + $H;
		2449
		2450	my $y = 0;
		2451
		2452	my $layout = $self->{layout};
		2453
		2454	$layout->set_font ($self->{font}) if $self->{font};
		2455
2231	glEnable GL_BLEND;	2456	glEnable GL_BLEND;
		2457	#TODO# not correct in windows where rgba is forced off
2232	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2458	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		2459
2247	for my $par (@{$self->{par}}) {	2460	for my $par (@{$self->{par}}) {
2248	my $h = $par->[0];	2461	my $h = $par->[1];
2249		2462
2250	if ($y0 < $y + $h && $y < $y1) {	2463	if ($y0 < $y + $h && $y < $y1) {
		2464	$layout->set_foreground (@{ $par->[2] });
		2465	$layout->set_width ($W - $par->[3]);
2251	$layout->set_text ($par->[2]);	2466	$layout->set_markup ($par->[4]);
2252		2467
2253	glColor @{ $par->[1] };	2468	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254	my ($W, $H) = $layout->size;	2469
2255	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2470	glRasterPos $par->[3], $y - $y0;
		2471	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2256	}	2472	}
2257		2473
2258	$y += $h;	2474	$y += $h;
2259	}	2475	}
2260		2476
2261	glDisable GL_TEXTURE_2D;
2262	glDisable GL_BLEND;	2477	glDisable GL_BLEND;
2263	};	2478	};
2264	});	2479	});
2265	}	2480	}
2266		2481
2267	sub _draw {	2482	sub _draw {
2268	my ($self) = @_;	2483	my ($self) = @_;
2269		2484
2270	glEnable GL_BLEND;
2271	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272	glEnable GL_TEXTURE_2D;	2485	glEnable GL_TEXTURE_2D;
2273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2486	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274	glColor 1, 1, 1, 1;	2487	glColor 1, 1, 1, 1;
2275	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2488	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276	glDisable GL_TEXTURE_2D;	2489	glDisable GL_TEXTURE_2D;
2277	glDisable GL_BLEND;
2278		2490
2279	$self->{children}[1]->draw;	2491	$self->{children}[1]->draw;
2280		2492
2281	}	2493	}
2282		2494
…		…
2350		2562
2351	# TODO: use animation	2563	# TODO: use animation
2352	if ($self->{state} = !$self->{state}) {	2564	if ($self->{state} = !$self->{state}) {
2353	$CFClient::UI::ROOT->add ($self->{other});	2565	$CFClient::UI::ROOT->add ($self->{other});
2354	$self->{other}->move ($self->coord2global (0, $self->{h}));	2566	$self->{other}->move ($self->coord2global (0, $self->{h}));
2355	$self->emit ("open");	2567	$self->_emit ("open");
2356	} else {	2568	} else {
2357	$CFClient::UI::ROOT->remove ($self->{other});	2569	$CFClient::UI::ROOT->remove ($self->{other});
2358	$self->emit ("close");	2570	$self->_emit ("close");
2359	}	2571	}
2360		2572
2361	$self->emit (changed => $self->{state});	2573	$self->_emit (changed => $self->{state});
2362	}	2574	}
2363		2575
2364	#############################################################################	2576	#############################################################################
2365		2577
2366	package CFClient::UI::Tooltip;	2578	package CFClient::UI::Tooltip;
…		…
2376	@_,	2588	@_,
2377	can_events => 0,	2589	can_events => 0,
2378	)	2590	)
2379	}	2591	}
2380		2592
2381	sub set_markup {	2593	sub set_tooltip_from {
2382	my ($self, $text) = @_;	2594	my ($self, $widget) = @_;
2383		2595
2384	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2596	$self->add (new CFClient::UI::Label
2385	$self->{label}->set_markup ($text);	2597	markup => $widget->{tooltip},
2386	$self->add ($self->{label});	2598	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2599	fontsize => 0.8,
		2600	fg => [0, 0, 0, 1],
		2601	ellipsise => 0,
		2602	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2603	);
2387	}	2604	}
2388		2605
2389	sub size_request {	2606	sub size_request {
2390	my ($self) = @_;	2607	my ($self) = @_;
2391
2392	$self->child->set_max_size ($::WIDTH * 0.3);
2393		2608
2394	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2609	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395		2610
2396	($w + 4, $h + 4)	2611	($w + 4, $h + 4)
2397	}	2612	}
…		…
2403	}	2618	}
2404		2619
2405	sub _draw {	2620	sub _draw {
2406	my ($self) = @_;	2621	my ($self) = @_;
2407		2622
2408	glPushMatrix;
2409	glTranslate 0.375, 0.375;	2623	glTranslate 0.375, 0.375;
2410		2624
2411	my ($w, $h) = @$self{qw(w h)};	2625	my ($w, $h) = @$self{qw(w h)};
2412		2626
2413	glColor 1, 0.8, 0.4;	2627	glColor 1, 0.8, 0.4;
…		…
2424	glVertex 0 , $h;	2638	glVertex 0 , $h;
2425	glVertex $w, $h;	2639	glVertex $w, $h;
2426	glVertex $w, 0;	2640	glVertex $w, 0;
2427	glEnd;	2641	glEnd;
2428		2642
2429	glPopMatrix;	2643	glTranslate 2 - 0.375, 2 - 0.375;
2430
2431	glTranslate 2, 2;
2432	$self->SUPER::_draw;	2644	$self->SUPER::_draw;
2433	}	2645	}
2434		2646
2435	#############################################################################	2647	#############################################################################
2436		2648
…		…
2441	use CFClient::OpenGL;	2653	use CFClient::OpenGL;
2442		2654
2443	sub new {	2655	sub new {
2444	my $class = shift;	2656	my $class = shift;
2445		2657
2446	$class->SUPER::new (	2658	my $self = $class->SUPER::new (
2447	aspect => 1,	2659	aspect => 1,
		2660	can_events => 0,
2448	@_,	2661	@_,
2449	)	2662	);
		2663
		2664	if ($self->{anim} && $self->{animspeed}) {
		2665	Scalar::Util::weaken (my $widget = $self);
		2666
		2667	$self->{timer} = Event->timer (
		2668	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2669	hard => 1,
		2670	interval => $self->{animspeed},
		2671	cb => sub {
		2672	++$widget->{frame};
		2673	$widget->update;
		2674	},
		2675	);
		2676	}
		2677
		2678	$self
2450	}	2679	}
2451		2680
2452	sub size_request {	2681	sub size_request {
2453	(32, 8)	2682	(32, 8)
2454	}	2683	}
2455		2684
		2685	sub update {
		2686	my ($self) = @_;
		2687
		2688	return unless $self->{visible};
		2689
		2690	$self->SUPER::update;
		2691	}
		2692
2456	sub _draw {	2693	sub _draw {
2457	my ($self) = @_;	2694	my ($self) = @_;
2458		2695
2459	return unless $::CONN;#d# manage and cache textures differently	2696	return unless $::CONN;
		2697
		2698	my $face;
		2699
		2700	if ($self->{frame}) {
		2701	my $anim = $::CONN->{anim}[$self->{anim}];
		2702
		2703	$face = $anim->[ $self->{frame} % @$anim ]
		2704	if $anim && @$anim;
		2705	}
		2706
2460	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2707	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461		2708
2462	# TODO animation
2463	if ($tex) {	2709	if ($tex) {
2464	glEnable GL_BLEND;
2465	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466	glEnable GL_TEXTURE_2D;	2710	glEnable GL_TEXTURE_2D;
2467	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2711	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468	glColor 1, 1, 1, 1;	2712	glColor 1, 1, 1, 1;
2469	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2713	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470	glDisable GL_TEXTURE_2D;	2714	glDisable GL_TEXTURE_2D;
2471	glDisable GL_BLEND;
2472	}	2715	}
		2716	}
		2717
		2718	sub DESTROY {
		2719	my ($self) = @_;
		2720
		2721	$self->{timer}->cancel
		2722	if $self->{timer};
		2723
		2724	$self->SUPER::DESTROY;
2473	}	2725	}
2474		2726
2475	#############################################################################	2727	#############################################################################
2476		2728
2477	package CFClient::UI::InventoryItem;	2729	package CFClient::UI::Inventory;
2478		2730
2479	our @ISA = CFClient::UI::HBox::;	2731	our @ISA = CFClient::UI::ScrolledWindow::;
2480		2732
2481	sub new {	2733	sub new {
2482	my $class = shift;	2734	my $class = shift;
2483		2735
2484	my %args = @_;
2485
2486	my $item = $args{item};
2487
2488	my $desc = $item->{nrof} < 2
2489	? $item->{name}
2490	: "$item->{nrof} $item->{name_pl}";
2491
2492
2493	my $self = $class->SUPER::new (	2736	my $self = $class->SUPER::new (
2494	can_hover => 1,	2737	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2495	can_events => 1,
2496	tooltip => (CFClient::UI::Label->escape ($desc)
2497	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498	connect_button_down => sub {
2499	my ($self, $ev, $x, $y) = @_;
2500
2501	# todo: maybe put examine on 1? but should just be a tooltip :(
2502	if ($ev->{button} == 1) {
2503	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504	} elsif ($ev->{button} == 2) {
2505	$::CONN->send ("apply $item->{tag}");
2506	} elsif ($ev->{button} == 3) {
2507	CFClient::UI::Menu->new (
2508	items => [
2509	["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}") }],
2515	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517	],
2518	)->popup ($ev);
2519	}
2520
2521	1
2522	},
2523	%args
2524	);
2525	$self->add(new CFClient::UI::Face
2526	can_events => 0,
2527	face => $item->{face},
2528	anim => $item->{anim},
2529	animspeed => $item->{animspeed});
2530	$self->add(new CFClient::UI::Label
2531	can_events => 0,
2532	text => $desc);
2533
2534	$self
2535	}
2536
2537	#############################################################################
2538
2539	package CFClient::UI::Inventory;
2540
2541	our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543	sub new {
2544	my $class = shift;
2545
2546	my $self = $class->SUPER::new (
2547	scrolled => (new CFClient::UI::VBox),
2548	@_,	2738	@_,
2549	);	2739	);
2550		2740
2551	$self	2741	$self
2552	}	2742	}
…		…
2555	my ($self, $items) = @_;	2745	my ($self, $items) = @_;
2556		2746
2557	$self->{scrolled}->clear;	2747	$self->{scrolled}->clear;
2558	return unless $items;	2748	return unless $items;
2559		2749
2560	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2750	my @items = sort {
		2751	($a->{type} <=> $b->{type})
		2752	or ($a->{name} cmp $b->{name})
		2753	} @$items;
2561		2754
2562	$self->{real_items} = \@items;	2755	$self->{real_items} = \@items;
2563		2756
		2757	my $row = 0;
2564	for my $item (@items) {	2758	for my $item (@items) {
2565	my $desc = $item->{nrof} < 2	2759	CFClient::Item::update_widgets $item;
2566	? $item->{name}
2567	: "$item->{nrof} $item->{name_pl}";
2568		2760
2569	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2761	$self->{scrolled}->add (0, $row, $item->{face_widget});
2570	}	2762	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2763	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2571		2764
2572	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2765	$row++;
		2766	}
2573	}	2767	}
2574		2768
2575	sub size_request {	2769	sub size_request {
2576	my ($self) = @_;	2770	my ($self) = @_;
2577	($self->{req_w}, $self->{req_h});	2771	($self->{req_w}, $self->{req_h});
…		…
2617		2811
2618	# popup given the event (must be a mouse button down event currently)	2812	# popup given the event (must be a mouse button down event currently)
2619	sub popup {	2813	sub popup {
2620	my ($self, $ev) = @_;	2814	my ($self, $ev) = @_;
2621		2815
2622	$self->emit ("popdown");	2816	$self->_emit ("popdown");
2623		2817
2624	# maybe save $GRAB? must be careful about events...	2818	# maybe save $GRAB? must be careful about events...
2625	$GRAB = $self;	2819	$GRAB = $self;
2626	$self->{button} = $ev->{button};	2820	$self->{button} = $ev->{button};
2627		2821
…		…
2642		2836
2643	if ($ev->{button} == $self->{button}) {	2837	if ($ev->{button} == $self->{button}) {
2644	undef $GRAB;	2838	undef $GRAB;
2645	$self->hide;	2839	$self->hide;
2646		2840
2647	$self->emit ("popdown");	2841	$self->_emit ("popdown");
2648	$self->{hover}[1]->() if $self->{hover};	2842	$self->{hover}[1]->() if $self->{hover};
2649	}	2843	}
		2844	}
		2845
		2846	#############################################################################
		2847
		2848	package CFClient::UI::Statusbox;
		2849
		2850	our @ISA = CFClient::UI::VBox::;
		2851
		2852	sub new {
		2853	my $class = shift;
		2854
		2855	$class->SUPER::new (
		2856	fontsize => 0.8,
		2857	@_,
		2858	)
		2859	}
		2860
		2861	sub reorder {
		2862	my ($self) = @_;
		2863	my $NOW = time;
		2864
		2865	while (my ($k, $v) = each %{ $self->{item} }) {
		2866	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2867	}
		2868
		2869	my @widgets;
		2870
		2871	my @items = sort {
		2872	$a->{pri} <=> $b->{pri}
		2873	or $b->{id} <=> $a->{id}
		2874	} values %{ $self->{item} };
		2875
		2876	my $count = 10 + 1;
		2877	for my $item (@items) {
		2878	last unless --$count;
		2879
		2880	push @widgets, $item->{label} ||= do {
		2881	# TODO: doesn't handle markup well (read as: at all)
		2882	my $short = $item->{count} > 1
		2883	? "<b>$item->{count} ×</b> $item->{text}"
		2884	: $item->{text};
		2885
		2886	for ($short) {
		2887	s/^\s+//;
		2888	s/\s+/ /g;
		2889	}
		2890
		2891	new CFClient::UI::Label
		2892	markup => $short,
		2893	tooltip => $item->{tooltip},
		2894	tooltip_font => $::FONT_PROP,
		2895	tooltip_width => 0.67,
		2896	fontsize => $item->{fontsize} || $self->{fontsize},
		2897	max_w => $::WIDTH * 0.44,
		2898	fg => $item->{fg},
		2899	can_events => 1,
		2900	can_hover => 1
		2901	};
		2902	}
		2903
		2904	$self->clear;
		2905	$self->SUPER::add (reverse @widgets);
		2906	}
		2907
		2908	sub add {
		2909	my ($self, $text, %arg) = @_;
		2910
		2911	$text =~ s/^\s+//;
		2912	$text =~ s/\s+$//;
		2913
		2914	return unless $text;
		2915
		2916	my $timeout = time + ((delete $arg{timeout}) || 60);
		2917
		2918	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2919
		2920	if (my $item = $self->{item}{$group}) {
		2921	if ($item->{text} eq $text) {
		2922	$item->{count}++;
		2923	} else {
		2924	$item->{count} = 1;
		2925	$item->{text} = $item->{tooltip} = $text;
		2926	}
		2927	$item->{id} = ++$self->{id};
		2928	$item->{timeout} = $timeout;
		2929	delete $item->{label};
		2930	} else {
		2931	$self->{item}{$group} = {
		2932	id => ++$self->{id},
		2933	text => $text,
		2934	timeout => $timeout,
		2935	tooltip => $text,
		2936	fg => [0.8, 0.8, 0.8, 0.8],
		2937	pri => 0,
		2938	count => 1,
		2939	%arg,
		2940	};
		2941	}
		2942
		2943	$self->reorder;
		2944	}
		2945
		2946	sub reconfigure {
		2947	my ($self) = @_;
		2948
		2949	delete $_->{label}
		2950	for values %{ $self->{item} || {} };
		2951
		2952	$self->reorder;
		2953	$self->SUPER::reconfigure;
2650	}	2954	}
2651		2955
2652	#############################################################################	2956	#############################################################################
2653		2957
2654	package CFClient::UI::Root;	2958	package CFClient::UI::Root;
…		…
2686	}	2990	}
2687		2991
2688	sub size_allocate {	2992	sub size_allocate {
2689	my ($self, $w, $h) = @_;	2993	my ($self, $w, $h) = @_;
2690		2994
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) {	2995	for my $child ($self->children) {
2708	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2996	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709		2997
		2998	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2999	if exists $child->{req_x};
		3000
		3001	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3002	if exists $child->{req_y};
		3003
2710	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3004	$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;	3005	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3006
2712	$child->configure ($X, $Y, $W, $H);	3007	$child->configure ($X, $Y, $W, $H);
2713	}	3008	}
2714
2715	$self->{old_w} = $w;
2716	$self->{old_h} = $h;
2717	}	3009	}
2718		3010
2719	sub coord2local {	3011	sub coord2local {
2720	my ($self, $x, $y) = @_;	3012	my ($self, $x, $y) = @_;
2721		3013
…		…
2734	$self->check_size;	3026	$self->check_size;
2735	$::WANT_REFRESH++;	3027	$::WANT_REFRESH++;
2736	}	3028	}
2737		3029
2738	sub add {	3030	sub add {
2739	my ($self, $child) = @_;	3031	my ($self, @children) = @_;
2740		3032
		3033	for (my @widgets = @children; my $w = pop @widgets; ) {
		3034	push @widgets, $w->children;
		3035	$w->{root} = $self;
		3036	$w->{visible} = 1;
		3037	}
		3038
		3039	for my $child (@children) {
		3040	$child->{is_toplevel} = 1;
		3041
2741	# integerise window positions	3042	# integerise window positions
2742	$child->{x} = int $child->{x};	3043	$child->{x} = int $child->{x};
2743	$child->{y} = int $child->{y};	3044	$child->{y} = int $child->{y};
		3045	}
2744		3046
2745	$self->SUPER::add ($child);	3047	$self->SUPER::add (@children);
		3048	}
		3049
		3050	sub remove {
		3051	my ($self, @children) = @_;
		3052
		3053	$self->SUPER::remove (@children);
		3054
		3055	while (@children) {
		3056	my $w = pop @children;
		3057	push @children, $w->children;
		3058	$w->set_invisible;
		3059	}
2746	}	3060	}
2747		3061
2748	sub on_refresh {	3062	sub on_refresh {
2749	my ($self, $id, $cb) = @_;	3063	my ($self, $id, $cb) = @_;
2750		3064
2751	$self->{refresh_hook}{$id} = $cb;	3065	$self->{refresh_hook}{$id} = $cb;
2752	}	3066	}
2753		3067
		3068	sub on_post_alloc {
		3069	my ($self, $id, $cb) = @_;
		3070
		3071	$self->{post_alloc_hook}{$id} = $cb;
		3072	}
		3073
2754	sub draw {	3074	sub draw {
2755	my ($self) = @_;	3075	my ($self) = @_;
		3076
		3077	while ($self->{refresh_hook}) {
		3078	$_->()
		3079	for values %{delete $self->{refresh_hook}};
		3080	}
2756		3081
2757	if ($self->{check_size}) {	3082	if ($self->{check_size}) {
2758	my @queue = ([], []);	3083	my @queue = ([], []);
2759		3084
2760	for (;;) {	3085	for (;;) {
…		…
2768		3093
2769	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3094	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770	? @$widget{qw(user_w user_h)}	3095	? @$widget{qw(user_w user_h)}
2771	: $widget->size_request;	3096	: $widget->size_request;
2772		3097
		3098	if (delete $widget->{force_alloc}
2773	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3099	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3100	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3101
2774	$widget->{req_w} = $w;	3102	$widget->{req_w} = $w;
2775	$widget->{req_h} = $h;	3103	$widget->{req_h} = $h;
2776		3104
2777	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3105	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2778		3106
2779	$widget->{parent}->check_size	3107	$widget->{parent}->check_size
2780	if $widget->{parent};	3108	if $widget->{parent};
2781	}	3109	}
2782	}	3110	}
…		…
2784		3112
2785	while ($self->{size_alloc}) {	3113	while ($self->{size_alloc}) {
2786	for (values %{delete $self->{size_alloc}}) {	3114	for (values %{delete $self->{size_alloc}}) {
2787	my ($widget, $w, $h) = @$_;	3115	my ($widget, $w, $h) = @$_;
2788		3116
		3117	$w = 0 if $w < 0;
		3118	$h = 0 if $h < 0;
		3119
2789	$widget->{w} = $w;	3120	$widget->{w} = $w;
2790	$widget->{h} = $h;	3121	$widget->{h} = $h;
2791	$widget->size_allocate ($w, $h);
2792	$widget->emit (size_allocate => $w, $h);	3122	$widget->emit (size_allocate => $w, $h);
2793	}	3123	}
2794	}	3124	}
2795		3125
2796	while ($self->{refresh_hook}) {	3126	while ($self->{post_alloc_hook}) {
2797	$_->()	3127	$_->()
2798	for values %{delete $self->{refresh_hook}};	3128	for values %{delete $self->{post_alloc_hook}};
2799	}	3129	}
2800		3130
2801	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3131	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3132	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803	glClear GL_COLOR_BUFFER_BIT;	3133	glClear GL_COLOR_BUFFER_BIT;
2804		3134
2805	glMatrixMode GL_PROJECTION;	3135	glMatrixMode GL_PROJECTION;
2806	glLoadIdentity;	3136	glLoadIdentity;
2807	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3137	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808	glMatrixMode GL_MODELVIEW;	3138	glMatrixMode GL_MODELVIEW;
2809	glLoadIdentity;	3139	glLoadIdentity;
2810		3140
2811	$self->_draw;	3141	$self->_draw;
2812	}	3142	}
…		…
2814	#############################################################################	3144	#############################################################################
2815		3145
2816	package CFClient::UI;	3146	package CFClient::UI;
2817		3147
2818	$ROOT = new CFClient::UI::Root;	3148	$ROOT = new CFClient::UI::Root;
2819	$TOOLTIP = new CFClient::UI::Tooltip;	3149	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820		3150
2821	1	3151	1
2822		3152

Diff Legend

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