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.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.241 by root, Fri May 26 20:50:35 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
8	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
9		11
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		13
12	our $ROOT;	14	our $ROOT;
13	our $TOOLTIP;	15	our $TOOLTIP;
14	our $BUTTON_STATE;	16	our $BUTTON_STATE;
		17
		18	our %WIDGET; # all widgets, weak-referenced
15		19
16	sub check_tooltip {	20	sub check_tooltip {
17	if (!$GRAB) {	21	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	22	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	23	if (length $widget->{tooltip}) {
…		…
23		27
24	my $tip = $widget->{tooltip};	28	my $tip = $widget->{tooltip};
25		29
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	30	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		31
28	$TOOLTIP->set_markup ($widget->{tooltip});	32	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	33	$TOOLTIP->show;
31		34
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	35	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		36
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	38	if $x + $TOOLTIP->{w} > $::WIDTH;
37		39
38	$TOOLTIP->move ($x, $y);	40	$TOOLTIP->move ($x, $y);
		41	$TOOLTIP->check_size;
		42	$TOOLTIP->update;
39	}	43	}
40		44
41	return;	45	return;
42	}	46	}
43	}	47	}
…		…
47	delete $TOOLTIP->{owner};	51	delete $TOOLTIP->{owner};
48	}	52	}
49		53
50	# class methods for events	54	# class methods for events
51	sub feed_sdl_key_down_event {	55	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	56	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	57	if $FOCUS;
54	}	58	}
55		59
56	sub feed_sdl_key_up_event {	60	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	61	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	62	if $FOCUS;
59	}	63	}
60		64
61	sub feed_sdl_button_down_event {	65	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	66	my ($ev) = @_;
…		…
71	check_tooltip;	75	check_tooltip;
72	}	76	}
73		77
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		79
76	if ($GRAB) {	80	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77	($x, $y) = $GRAB->coord2local ($x, $y);	81	if $GRAB;
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79	}
80	}	82	}
81		83
82	sub feed_sdl_button_up_event {	84	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	85	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	86	my ($x, $y) = ($ev->{x}, $ev->{y});
85		87
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87		89
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		91
90	if ($GRAB) {	92	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91	($x, $y) = $GRAB->coord2local ($x, $y);	93	if $GRAB;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		94
95	if (!$BUTTON_STATE) {	95	if (!$BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	96	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	97	$grab->update if $grab;
98	$GRAB->update if $GRAB;	98	$GRAB->update if $GRAB;
…		…
114	$HOVER->update if $HOVER && $HOVER->{can_hover};	114	$HOVER->update if $HOVER && $HOVER->{can_hover};
115		115
116	check_tooltip;	116	check_tooltip;
117	}	117	}
118		118
119	if ($HOVER) {
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	119	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122	}	120	if $HOVER;
123	}	121	}
124		122
125	# convert position array to integers	123	# convert position array to integers
126	sub harmonize {	124	sub harmonize {
127	my ($vals) = @_;	125	my ($vals) = @_;
…		…
131	for (@$vals) {	129	for (@$vals) {
132	my $i = int $_ + $rem;	130	my $i = int $_ + $rem;
133	$rem += $_ - $i;	131	$rem += $_ - $i;
134	$_ = $i;	132	$_ = $i;
135	}	133	}
		134	}
		135
		136	sub full_refresh {
		137	# make a copy, otherwise for complains about freed values.
		138	my @widgets = values %WIDGET;
		139
		140	$_->update
		141	for @widgets;
		142	}
		143
		144	sub reconfigure_widgets {
		145	# make a copy, otherwise C<for> complains about freed values.
		146	my @widgets = values %WIDGET;
		147
		148	$_->reconfigure
		149	for @widgets;
		150	}
		151
		152	# call when resolution changes etc.
		153	sub rescale_widgets {
		154	my ($sx, $sy) = @_;
		155
		156	for my $widget (values %WIDGET) {
		157	if ($widget->{is_toplevel}) {
		158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		166	}
		167	}
		168
		169	reconfigure_widgets;
136	}	170	}
137		171
138	#############################################################################	172	#############################################################################
139		173
140	package CFClient::UI::Base;	174	package CFClient::UI::Base;
…		…
158	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
160	}	194	}
161	}	195	}
162		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
163	$self	199	$self
164	}	200	}
165		201
166	sub destroy {	202	sub destroy {
167	my ($self) = @_;	203	my ($self) = @_;
…		…
170	%$self = ();	206	%$self = ();
171	}	207	}
172		208
173	sub show {	209	sub show {
174	my ($self) = @_;	210	my ($self) = @_;
175
176	return if $self->{parent};	211	return if $self->{parent};
177		212
178	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
179	}	214	}
180		215
181	sub hide {	216	sub show_centered {
182	my ($self) = @_;	217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
		227	}
		228
		229	sub set_invisible {
		230	my ($self) = @_;
		231
		232	# broken show/hide model
		233
		234	delete $self->{root};
		235	delete $self->{visible};
183		236
184	undef $GRAB if $GRAB == $self;	237	undef $GRAB if $GRAB == $self;
185	undef $HOVER if $HOVER == $self;	238	undef $HOVER if $HOVER == $self;
		239
		240	CFClient::UI::check_tooltip
		241	if $CFClient::UI::TOOLTIP->{owner} == $self;
		242
		243	$self->focus_out;
		244	}
		245
		246	sub hide {
		247	my ($self) = @_;
		248
		249	$self->set_invisible;
186		250
187	$self->{parent}->remove ($self)	251	$self->{parent}->remove ($self)
188	if $self->{parent};	252	if $self->{parent};
189	}	253	}
190		254
…		…
240		304
241	sub size_allocate {	305	sub size_allocate {
242	# nothing to be done	306	# nothing to be done
243	}	307	}
244		308
		309	sub reconfigure {
		310	my ($self) = @_;
		311
		312	$self->check_size (1);
		313	$self->update;
		314	}
		315
245	sub children {	316	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	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257	$self->update;
258	}	317	}
259		318
260	sub set_max_size {	319	sub set_max_size {
261	my ($self, $w, $h) = @_;	320	my ($self, $w, $h) = @_;
262		321
263	delete $self->{max_w}; $self->{max_w} = $w if $w;	322	delete $self->{max_w}; $self->{max_w} = $w if $w;
264	delete $self->{max_h}; $self->{max_h} = $h if $h;	323	delete $self->{max_h}; $self->{max_h} = $h if $h;
		324	}
		325
		326	sub set_tooltip {
		327	my ($self, $tooltip) = @_;
		328
		329	$tooltip =~ s/^\s+//;
		330	$tooltip =~ s/\s+$//;
		331
		332	return if $self->{tooltip} eq $tooltip;
		333
		334	$self->{tooltip} = $tooltip;
		335
		336	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		337	delete $CFClient::UI::TOOLTIP->{owner};
		338	CFClient::UI::check_tooltip;
		339	}
265	}	340	}
266		341
267	# translate global coordinates to local coordinate system	342	# translate global coordinates to local coordinate system
268	sub coord2local {	343	sub coord2local {
269	my ($self, $x, $y) = @_;	344	my ($self, $x, $y) = @_;
…		…
284	return if $FOCUS == $self;	359	return if $FOCUS == $self;
285	return unless $self->{can_focus};	360	return unless $self->{can_focus};
286		361
287	my $focus = $FOCUS; $FOCUS = $self;	362	my $focus = $FOCUS; $FOCUS = $self;
288		363
289	$self->emit (focus_in => $focus);	364	$self->_emit (focus_in => $focus);
290		365
291	$focus->update if $focus;	366	$focus->update if $focus;
292	$FOCUS->update;	367	$FOCUS->update;
293	}	368	}
294		369
…		…
297		372
298	return unless $FOCUS == $self;	373	return unless $FOCUS == $self;
299		374
300	my $focus = $FOCUS; undef $FOCUS;	375	my $focus = $FOCUS; undef $FOCUS;
301		376
302	$self->emit (focus_out => $focus);	377	$self->_emit (focus_out => $focus);
303		378
304	$focus->update if $focus; #?	379	$focus->update if $focus; #?
		380
		381	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		382	unless $FOCUS;
305	}	383	}
306		384
307	sub mouse_motion { }	385	sub mouse_motion { }
308	sub button_up { }	386	sub button_up { }
309	sub key_down { }	387	sub key_down { }
310	sub key_up { }	388	sub key_up { }
311		389
312	sub button_down {	390	sub button_down {
313	my ($self, $ev, $x, $y) = @_;	391	my ($self, $ev, $x, $y) = @_;
314		392
315	$self->focus_in;	393	$self->focus_in;
…		…
349	if ($ENV{PCLIENT_DEBUG}) {	427	if ($ENV{PCLIENT_DEBUG}) {
350	glPushMatrix;	428	glPushMatrix;
351	glColor 1, 1, 0, 1;	429	glColor 1, 1, 0, 1;
352	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	430	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353	glBegin GL_LINE_LOOP;	431	glBegin GL_LINE_LOOP;
354	glVertex 0 , 0;	432	glVertex 0 , 0;
355	glVertex $self->{w}, 0;	433	glVertex $self->{w} - 1, 0;
356	glVertex $self->{w}, $self->{h};	434	glVertex $self->{w} - 1, $self->{h} - 1;
357	glVertex 0 , $self->{h};	435	glVertex 0 , $self->{h} - 1;
358	glEnd;	436	glEnd;
359	glPopMatrix;	437	glPopMatrix;
360	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	438	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361	}	439	}
362	}	440	}
363		441
364	sub _draw {	442	sub _draw {
365	my ($self) = @_;	443	my ($self) = @_;
…		…
382	sub set_parent {	460	sub set_parent {
383	my ($self, $parent) = @_;	461	my ($self, $parent) = @_;
384		462
385	Scalar::Util::weaken ($self->{parent} = $parent);	463	Scalar::Util::weaken ($self->{parent} = $parent);
386		464
		465	$self->{root} = $parent->{root};
		466	$self->{visible} = $parent->{visible} + 1;
		467
		468	# TODO: req_w _does_change after ->reconfigure
387	$self->check_size	469	$self->check_size
388	unless exists $self->{req_w};	470	unless exists $self->{req_w};
		471
		472	$self->show;
389	}	473	}
390		474
391	sub check_size {	475	sub check_size {
392	my ($self) = @_;	476	my ($self, $forced) = @_;
393		477
		478	$self->{force_alloc} = 1 if $forced;
394	$CFClient::UI::ROOT->{check_size}{$self} = $self;	479	$CFClient::UI::ROOT->{check_size}{$self} = $self;
395	}	480	}
396		481
397	sub update {	482	sub update {
398	my ($self) = @_;	483	my ($self) = @_;
…		…
405	my ($self, $signal, $cb) = @_;	490	my ($self, $signal, $cb) = @_;
406		491
407	push @{ $self->{signal_cb}{$signal} }, $cb;	492	push @{ $self->{signal_cb}{$signal} }, $cb;
408	}	493	}
409		494
		495	sub _emit {
		496	my ($self, $signal, @args) = @_;
		497
		498	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		499	}
		500
410	sub emit {	501	sub emit {
411	my ($self, $signal, @args) = @_;	502	my ($self, $signal, @args) = @_;
412		503
413	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	504	$self->_emit ($signal, @args)
		505	|| $self->$signal (@args);
414	}	506	}
415		507
416	sub DESTROY {	508	sub DESTROY {
417	my ($self) = @_;	509	my ($self) = @_;
418		510
		511	delete $WIDGET{$self+0};
419	#$self->deactivate;	512	#$self->deactivate;
420	}	513	}
421		514
422	#############################################################################	515	#############################################################################
423		516
…		…
432	my $class = shift;	525	my $class = shift;
433		526
434	# range [value, low, high, page]	527	# range [value, low, high, page]
435		528
436	$class->SUPER::new (	529	$class->SUPER::new (
437	bg => [0, 0, 0, 0.2],	530	#bg => [0, 0, 0, 0.2],
438	active_bg => [1, 1, 1, 0.5],	531	#active_bg => [1, 1, 1, 0.5],
439	@_	532	@_
440	)	533	)
441	}	534	}
442		535
443	sub _draw {	536	sub _draw {
444	my ($self) = @_;	537	my ($self) = @_;
445		538
		539	my $color = $FOCUS == $self && $self->{active_bg}
		540	? $self->{active_bg}
		541	: $self->{bg};
		542
		543	if ($color && (@$color < 4 || $color->[3])) {
446	my ($w, $h) = @$self{qw(w h)};	544	my ($w, $h) = @$self{qw(w h)};
447		545
448	glEnable GL_BLEND;	546	glEnable GL_BLEND;
449	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	547	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	548	glColor @$color;
451		549
452	glBegin GL_QUADS;	550	glBegin GL_QUADS;
453	glVertex 0 , 0;	551	glVertex 0 , 0;
454	glVertex 0 , $h;	552	glVertex 0 , $h;
455	glVertex $w, $h;	553	glVertex $w, $h;
456	glVertex $w, 0;	554	glVertex $w, 0;
457	glEnd;	555	glEnd;
458		556
459	glDisable GL_BLEND;	557	glDisable GL_BLEND;
		558	}
460	}	559	}
461		560
462	#############################################################################	561	#############################################################################
463		562
464	package CFClient::UI::Empty;	563	package CFClient::UI::Empty;
…		…
508	$self->{children} = [	607	$self->{children} = [
509	sort { $a->{z} <=> $b->{z} }	608	sort { $a->{z} <=> $b->{z} }
510	@{$self->{children}}, @widgets	609	@{$self->{children}}, @widgets
511	];	610	];
512		611
513	$self->check_size;	612	$self->check_size (1);
514	$self->update;	613	$self->update;
515	}	614	}
516		615
517	sub children {	616	sub children {
518	@{ $_[0]{children} }	617	@{ $_[0]{children} }
…		…
524	delete $child->{parent};	623	delete $child->{parent};
525	$child->hide;	624	$child->hide;
526		625
527	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	626	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528		627
529	$self->check_size;	628	$self->check_size (1);
530	$self->update;	629	$self->update;
531	}	630	}
532		631
533	sub clear {	632	sub clear {
534	my ($self) = @_;	633	my ($self) = @_;
…		…
625	}	724	}
626		725
627	sub update {	726	sub update {
628	my ($self) = @_;	727	my ($self) = @_;
629		728
630	$ROOT->on_refresh ($self => sub { $self->render_child });	729	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	730	$self->SUPER::update;
632	}	731	}
633		732
634	sub size_allocate {	733	sub size_allocate {
635	my ($self, $w, $h) = @_;	734	my ($self, $w, $h) = @_;
…		…
648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	747	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649	glClearColor 0, 0, 0, 0;	748	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	749	glClear GL_COLOR_BUFFER_BIT;
651		750
652	$self->_render;	751	$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	};	752	};
661	}	753	}
662		754
663	sub _draw {	755	sub _draw {
664	my ($self) = @_;	756	my ($self) = @_;
…		…
666	my ($w, $h) = ($self->w, $self->h);	758	my ($w, $h) = ($self->w, $self->h);
667		759
668	my $tex = $self->{texture}	760	my $tex = $self->{texture}
669	or return;	761	or return;
670		762
671	glEnable GL_BLEND;
672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	763	glEnable GL_TEXTURE_2D;
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	764	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675	glColor 0, 0, 0, 1;	765	glColor 1, 1, 1, 1;
676		766
677	$tex->draw_quad (0, 0, $w, $h);	767	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678		768
679	glDisable GL_BLEND;
680	glDisable GL_TEXTURE_2D;	769	glDisable GL_TEXTURE_2D;
681	}	770	}
682		771
683	#############################################################################	772	#############################################################################
684		773
685	package CFClient::UI::ViewPort;	774	package CFClient::UI::ViewPort;
686		775
687	our @ISA = CFClient::UI::Window::;	776	our @ISA = CFClient::UI::Window::;
688		777
		778	sub new {
		779	my $class = shift;
		780
		781	$class->SUPER::new (
		782	scroll_x => 0,
		783	scroll_y => 1,
		784	@_,
		785	)
		786	}
		787
689	sub size_request {	788	sub size_request {
690	my ($self) = @_;	789	my ($self) = @_;
691		790
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	791	@$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		792
695	@$self{qw(child_w child_h)}	793	@$self{qw(child_w child_h)}
696	}	794	}
697		795
698	sub size_allocate {	796	sub size_allocate {
699	my ($self, $w, $h) = @_;	797	my ($self, $w, $h) = @_;
700		798
		799	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		800	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		801
		802	$self->child->configure (0, 0, $w, $h);
701	$self->update;	803	$self->update;
702	}	804	}
703		805
704	sub set_offset {	806	sub set_offset {
705	my ($self, $x, $y) = @_;	807	my ($self, $x, $y) = @_;
…		…
759		861
760	my $slider = new CFClient::UI::Slider	862	my $slider = new CFClient::UI::Slider
761	vertical => 1,	863	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	864	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	865	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	866	$self->{vp}->set_offset (0, $_[1]);
765	},	867	},
766	;	868	;
767		869
768	$self = $class->SUPER::new (	870	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	871	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	872	slider => $slider,
771	@_,	873	@_,
772	);	874	);
773		875
774	$self->{vp}->add ($self->{scrolled});	876	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	878	$self->add ($self->{slider});
777		879
778	$self	880	$self
779	}	881	}
780		882
		883	sub update {
		884	my ($self) = @_;
		885
		886	$self->SUPER::update;
		887
		888	# todo: overwrite size_allocate of child
		889	my $child = $self->{vp}->child;
		890	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		891	}
		892
		893	sub size_allocate {
		894	my ($self, $w, $h) = @_;
		895
		896	$self->SUPER::size_allocate ($w, $h);
		897
		898	my $child = $self->{vp}->child;
		899	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		900	}
		901
781	#TODO# update range on size_allocate depeneing on child	902	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	903	# update viewport offset on scroll
783		904
784	#############################################################################	905	#############################################################################
785		906
786	package CFClient::UI::Frame;	907	package CFClient::UI::Frame;
…		…
790	use CFClient::OpenGL;	911	use CFClient::OpenGL;
791		912
792	sub new {	913	sub new {
793	my $class = shift;	914	my $class = shift;
794		915
795	my $self = $class->SUPER::new (	916	$class->SUPER::new (
796	bg => [1, 1, 1, 1],	917	bg => undef,
797	border_bg => [1, 1, 1, 1],
798	border => 0.8,
799	@_	918	@_,
800	);	919	)
801
802	$self
803	}	920	}
804		921
805	sub _draw {	922	sub _draw {
806	my ($self) = @_;	923	my ($self) = @_;
807		924
808	my ($w, $h) = ($self->{w}, $self->{h});	925	if ($self->{bg}) {
		926	my ($w, $h) = @$self{qw(w h)};
809		927
810	glEnable GL_BLEND;	928	glEnable GL_BLEND;
811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	929	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812	glEnable GL_TEXTURE_2D;	930	glColor @{ $self->{bg} };
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814		931
815	# glBegin GL_QUADS;	932	glBegin GL_QUADS;
816	# glColor 0, 0, 0, 0;
817	# glVertex 0 , 0;	933	glVertex 0 , 0;
818	# glVertex 0 , $h;	934	glVertex 0 , $h;
819	# glVertex $w, $h;	935	glVertex $w, $h;
820	# glVertex $w, 0;	936	glVertex $w, 0;
821	# glEnd;	937	glEnd;
822		938
823
824	$self->child->draw;
825	glDisable GL_BLEND;	939	glDisable GL_BLEND;
826	glDisable GL_TEXTURE_2D;	940	}
		941
		942	$self->SUPER::_draw;
827	}	943	}
828		944
829	#############################################################################	945	#############################################################################
830		946
831	package CFClient::UI::FancyFrame;	947	package CFClient::UI::FancyFrame;
…		…
842	my $class = shift;	958	my $class = shift;
843		959
844	# TODO: user_x, user_y, overwrite moveto?	960	# TODO: user_x, user_y, overwrite moveto?
845		961
846	my $self = $class->SUPER::new (	962	my $self = $class->SUPER::new (
847	bg => [1, 1, 1, 1],	963	bg => [1, 1, 1, 1],
848	border_bg => [1, 1, 1, 1],	964	border_bg => [1, 1, 1, 1],
849	border => 0.6,	965	border => 0.6,
		966	is_toplevel => 1,
850	can_events => 1,	967	can_events => 1,
851	@_	968	@_
852	);	969	);
853		970
854	$self->{title} &&= new CFClient::UI::Label	971	$self->{title} &&= new CFClient::UI::Label
855	align => 0,	972	align => 0,
…		…
879	my ($self, $w, $h) = @_;	996	my ($self, $w, $h) = @_;
880		997
881	$h -= List::Util::max 0, $self->border * 2;	998	$h -= List::Util::max 0, $self->border * 2;
882	$w -= List::Util::max 0, $self->border * 2;	999	$w -= List::Util::max 0, $self->border * 2;
883		1000
884	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1001	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885	if $self->{title};	1002	if $self->{title};
886		1003
887	$self->child->configure ($self->border, $self->border, $w, $h);	1004	$self->child->configure ($self->border, $self->border, $w, $h);
888	}	1005	}
889		1006
…		…
947	my ($self) = @_;	1064	my ($self) = @_;
948		1065
949	my ($w, $h ) = ($self->{w}, $self->{h});	1066	my ($w, $h ) = ($self->{w}, $self->{h});
950	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1067	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951		1068
952	glEnable GL_BLEND;
953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954	glEnable GL_TEXTURE_2D;	1069	glEnable GL_TEXTURE_2D;
955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1070	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956		1071
957	my $border = $self->border;	1072	my $border = $self->border;
958		1073
959	glColor @{ $self->{border_bg} };	1074	glColor @{ $self->{border_bg} };
960	$tex[1]->draw_quad (0, 0, $w, $border);	1075	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
961	$tex[3]->draw_quad (0, $border, $border, $ch);	1076	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1077	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1078	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964		1079
965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1080	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966	my $bg = $tex[0];	1081	my $bg = $tex[0];
967		1082
968	# TODO: repeat texture not scale	1083	# TODO: repeat texture not scale
…		…
972	glColor @{ $self->{bg} };	1087	glColor @{ $self->{bg} };
973		1088
974	$bg->{s} = $rep_x;	1089	$bg->{s} = $rep_x;
975	$bg->{t} = $rep_y;	1090	$bg->{t} = $rep_y;
976	$bg->{wrap_mode} = 1;	1091	$bg->{wrap_mode} = 1;
977	$bg->draw_quad ($border, $border, $cw, $ch);	1092	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1093	}
978		1094
979	glDisable GL_TEXTURE_2D;	1095	glDisable GL_TEXTURE_2D;
980	glDisable GL_BLEND;
981	}
982		1096
983	$self->{title}->draw if $self->{title};	1097	$self->{title}->draw if $self->{title};
984		1098
985	$self->child->draw;	1099	$self->child->draw;
986	}	1100	}
…		…
998	sub new {	1112	sub new {
999	my $class = shift;	1113	my $class = shift;
1000		1114
1001	$class->SUPER::new (	1115	$class->SUPER::new (
1002	col_expand => [],	1116	col_expand => [],
1003	@_	1117	@_,
1004	)	1118	)
		1119	}
		1120
		1121	sub children {
		1122	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005	}	1123	}
1006		1124
1007	sub add {	1125	sub add {
1008	my ($self, $x, $y, $child) = @_;	1126	my ($self, $x, $y, $child) = @_;
1009		1127
1010	$child->set_parent ($self);	1128	$child->set_parent ($self);
1011	$self->{children}[$y][$x] = $child;	1129	$self->{children}[$y][$x] = $child;
1012		1130
1013	$child->check_size;	1131	$self->check_size (1);
1014	}	1132	}
1015		1133
1016	sub children {
1017	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018	}
1019
1020	# TODO: move to container class maybe? send childs a signal on removal?	1134	# TODO: move to container class maybe? send children a signal on removal?
1021	sub clear {	1135	sub clear {
1022	my ($self) = @_;	1136	my ($self) = @_;
1023		1137
1024	my @children = $self->children;	1138	my @children = $self->children;
1025	delete $self->{children};	1139	delete $self->{children};
…		…
1027	for (@children) {	1141	for (@children) {
1028	delete $_->{parent};	1142	delete $_->{parent};
1029	$_->hide;	1143	$_->hide;
1030	}	1144	}
1031		1145
		1146	$self->check_size (1);
1032	$self->update;	1147	$self->update;
1033	}	1148	}
1034		1149
1035	sub get_wh {	1150	sub get_wh {
1036	my ($self) = @_;	1151	my ($self) = @_;
…		…
1068	sub size_allocate {	1183	sub size_allocate {
1069	my ($self, $w, $h) = @_;	1184	my ($self, $w, $h) = @_;
1070		1185
1071	my ($ws, $hs) = $self->get_wh;	1186	my ($ws, $hs) = $self->get_wh;
1072		1187
1073	my $req_w = sum @$ws;	1188	my $req_w = (sum @$ws) || 1;
1074	my $req_h = sum @$hs;	1189	my $req_h = (sum @$hs) || 1;
1075		1190
1076	# TODO: nicer code && do row_expand	1191	# TODO: nicer code && do row_expand
1077	my @col_expand = @{$self->{col_expand}};	1192	my @col_expand = @{$self->{col_expand}};
1078	@col_expand = (1) x @$ws unless @col_expand;	1193	@col_expand = (1) x @$ws unless @col_expand;
1079	my $col_expand = (sum @col_expand) || 1;	1194	my $col_expand = (sum @col_expand) || 1;
…		…
1253		1368
1254	#############################################################################	1369	#############################################################################
1255		1370
1256	package CFClient::UI::Label;	1371	package CFClient::UI::Label;
1257		1372
1258	our @ISA = CFClient::UI::Base::;	1373	our @ISA = CFClient::UI::DrawBG::;
1259		1374
1260	use CFClient::OpenGL;	1375	use CFClient::OpenGL;
1261		1376
1262	sub new {	1377	sub new {
1263	my ($class, %arg) = @_;	1378	my ($class, %arg) = @_;
1264		1379
1265	my $self = $class->SUPER::new (	1380	my $self = $class->SUPER::new (
1266	fg => [1, 1, 1],	1381	fg => [1, 1, 1],
		1382	#bg => none
		1383	#active_bg => none
1267	#font => default_font	1384	#font => default_font
		1385	#text => initial text
		1386	#markup => initial narkup
		1387	#max_w => maximum pixel width
		1388	ellipsise => 3, # end
		1389	layout => (new CFClient::Layout),
1268	fontsize => 1,	1390	fontsize => 1,
1269	text => "",
1270	align => -1,	1391	align => -1,
1271	valign => -1,	1392	valign => -1,
1272	padding => 2,	1393	padding => 2,
1273	layout => new CFClient::Layout,
1274	can_events => 0,	1394	can_events => 0,
1275	%arg	1395	%arg
1276	);	1396	);
1277		1397
1278	if (exists $self->{template}) {	1398	if (exists $self->{template}) {
1279	my $layout = new CFClient::Layout;	1399	my $layout = new CFClient::Layout;
1280	$layout->set_text (delete $self->{template});	1400	$layout->set_text (delete $self->{template});
1281	$self->{template} = $layout;	1401	$self->{template} = $layout;
1282	}	1402	}
1283		1403
1284	$self->set_text (delete $self->{text}) if exists $self->{text};	1404	if (exists $self->{markup}) {
1285	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1405	$self->set_markup (delete $self->{markup});
		1406	} else {
		1407	$self->set_text (delete $self->{text});
		1408	}
1286		1409
1287	$self	1410	$self
1288	}	1411	}
1289		1412
1290	sub escape {	1413	sub escape($) {
1291	local $_ = $_[1];	1414	local $_ = $_[0];
1292		1415
1293	s/&/&amp;/g;	1416	s/&/&amp;/g;
1294	s/>/&gt;/g;	1417	s/>/&gt;/g;
1295	s/</&lt;/g;	1418	s/</&lt;/g;
1296		1419
1297	$_[1]	1420	$_
1298	}	1421	}
1299		1422
1300	sub update {	1423	sub update {
1301	my ($self) = @_;	1424	my ($self) = @_;
1302		1425
…		…
1308	my ($self, $text) = @_;	1431	my ($self, $text) = @_;
1309		1432
1310	return if $self->{text} eq "T$text";	1433	return if $self->{text} eq "T$text";
1311	$self->{text} = "T$text";	1434	$self->{text} = "T$text";
1312		1435
		1436	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313	$self->{layout}->set_text ($text);	1437	$self->{layout}->set_text ($text);
1314		1438
1315	$self->update;	1439	$self->update;
1316	$self->check_size;	1440	$self->check_size;
1317	}	1441	}
…		…
1320	my ($self, $markup) = @_;	1444	my ($self, $markup) = @_;
1321		1445
1322	return if $self->{text} eq "M$markup";	1446	return if $self->{text} eq "M$markup";
1323	$self->{text} = "M$markup";	1447	$self->{text} = "M$markup";
1324		1448
		1449	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1450
		1451	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325	$self->{layout}->set_markup ($markup);	1452	$self->{layout}->set_markup ($markup);
1326		1453
1327	$self->update;	1454	$self->update;
1328	$self->check_size;	1455	$self->check_size;
1329	}	1456	}
…		…
1331	sub size_request {	1458	sub size_request {
1332	my ($self) = @_;	1459	my ($self) = @_;
1333		1460
1334	$self->{layout}->set_font ($self->{font}) if $self->{font};	1461	$self->{layout}->set_font ($self->{font}) if $self->{font};
1335	$self->{layout}->set_width ($self->{max_w} || -1);	1462	$self->{layout}->set_width ($self->{max_w} || -1);
		1463	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1464	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1465	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337		1466
1338	my ($w, $h) = $self->{layout}->size;	1467	my ($w, $h) = $self->{layout}->size;
1339		1468
1340	if (exists $self->{template}) {	1469	if (exists $self->{template}) {
…		…
1370	}	1499	}
1371		1500
1372	sub _draw {	1501	sub _draw {
1373	my ($self) = @_;	1502	my ($self) = @_;
1374		1503
		1504	$self->SUPER::_draw; # draw background, if applicable
		1505
1375	my $tex = $self->{texture} ||= do {	1506	my $tex = $self->{texture} ||= do {
		1507	$self->{layout}->set_foreground (@{$self->{fg}});
1376	$self->{layout}->set_font ($self->{font}) if $self->{font};	1508	$self->{layout}->set_font ($self->{font}) if $self->{font};
1377	$self->{layout}->set_width ($self->{w});	1509	$self->{layout}->set_width ($self->{w});
		1510	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1511	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1378	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1512	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1513
1379	new_from_layout CFClient::Texture $self->{layout}	1514	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1515
		1516	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1517	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1518	: ($self->{w} - $tex->{w}) * 0.5);
		1519
		1520	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1521	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1522	: ($self->{h} - $tex->{h}) * 0.5);
		1523
		1524	$tex
1380	};	1525	};
1381		1526
1382	glEnable GL_BLEND;
1383	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384	glEnable GL_TEXTURE_2D;	1527	glEnable GL_TEXTURE_2D;
1385	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1528	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386		1529
		1530	if ($tex->{format} == GL_ALPHA) {
1387	glColor @{$self->{fg}};	1531	glColor @{$self->{fg}};
1388
1389	$self->{ox} = int (
1390	$self->{align} < 0 ? $self->{padding}
1391	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1392	: ($self->{w} - $tex->{w}) * 0.5
1393	);
1394
1395	$self->{oy} = int (
1396	$self->{valign} < 0 ? $self->{padding}
1397	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1398	: ($self->{h} - $tex->{h}) * 0.5
1399	);
1400
1401	$tex->draw_quad ($self->{ox}, $self->{oy});	1532	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1533	} else {
		1534	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1535	}
1402		1536
1403	glDisable GL_TEXTURE_2D;	1537	glDisable GL_TEXTURE_2D;
1404	glDisable GL_BLEND;
1405	}	1538	}
1406		1539
1407	#############################################################################	1540	#############################################################################
1408		1541
1409	package CFClient::UI::EntryBase;	1542	package CFClient::UI::EntryBase;
…		…
1422	active_fg => [0, 0, 0],	1555	active_fg => [0, 0, 0],
1423	can_hover => 1,	1556	can_hover => 1,
1424	can_focus => 1,	1557	can_focus => 1,
1425	valign => 0,	1558	valign => 0,
1426	can_events => 1,	1559	can_events => 1,
		1560	#text => ...
1427	@_	1561	@_
1428	)	1562	)
1429	}	1563	}
1430		1564
1431	sub _set_text {	1565	sub _set_text {
…		…
1441	$self->{text} = $text;	1575	$self->{text} = $text;
1442		1576
1443	$text =~ s/./*/g if $self->{hidden};	1577	$text =~ s/./*/g if $self->{hidden};
1444	$self->{layout}->set_text ("$text ");	1578	$self->{layout}->set_text ("$text ");
1445		1579
1446	$self->emit (changed => $self->{text});	1580	$self->_emit (changed => $self->{text});
1447	}
1448
1449	sub get_text {
1450	$_[0]{text}
1451	}
1452
1453	sub size_request {
1454	my ($self) = @_;
1455
1456	my ($w, $h) = $self->SUPER::size_request;
1457
1458	($w + 1, $h) # add 1 for cursor
1459	}
1460
1461	sub size_allocate {
1462	my ($self, $w, $h) = @_;
1463
1464	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1465	}	1581	}
1466		1582
1467	sub set_text {	1583	sub set_text {
1468	my ($self, $text) = @_;	1584	my ($self, $text) = @_;
1469		1585
1470	$self->{cursor} = length $text;	1586	$self->{cursor} = length $text;
1471	$self->_set_text ($text);	1587	$self->_set_text ($text);
1472	$self->update;	1588	$self->update;
		1589	$self->check_size;
		1590	}
		1591
		1592	sub get_text {
		1593	$_[0]{text}
		1594	}
		1595
		1596	sub size_request {
		1597	my ($self) = @_;
		1598
		1599	my ($w, $h) = $self->SUPER::size_request;
		1600
		1601	($w + 1, $h) # add 1 for cursor
1473	}	1602	}
1474		1603
1475	sub key_down {	1604	sub key_down {
1476	my ($self, $ev) = @_;	1605	my ($self, $ev) = @_;
1477		1606
…		…
1479	my $sym = $ev->{sym};	1608	my $sym = $ev->{sym};
1480	my $uni = $ev->{unicode};	1609	my $uni = $ev->{unicode};
1481		1610
1482	my $text = $self->get_text;	1611	my $text = $self->get_text;
1483		1612
1484	if ($sym == 8) {	1613	if ($uni == 8) {
1485	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1614	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486	} elsif ($sym == 127) {	1615	} elsif ($uni == 127) {
1487	substr $text, $self->{cursor}, 1, "";	1616	substr $text, $self->{cursor}, 1, "";
1488	} elsif ($sym == CFClient::SDLK_LEFT) {	1617	} elsif ($sym == CFClient::SDLK_LEFT) {
1489	--$self->{cursor} if $self->{cursor};	1618	--$self->{cursor} if $self->{cursor};
1490	} elsif ($sym == CFClient::SDLK_RIGHT) {	1619	} elsif ($sym == CFClient::SDLK_RIGHT) {
1491	++$self->{cursor} if $self->{cursor} < length $self->{text};	1620	++$self->{cursor} if $self->{cursor} < length $self->{text};
1492	} elsif ($sym == CFClient::SDLK_HOME) {	1621	} elsif ($sym == CFClient::SDLK_HOME) {
1493	$self->{cursor} = 0;	1622	$self->{cursor} = 0;
1494	} elsif ($sym == CFClient::SDLK_END) {	1623	} elsif ($sym == CFClient::SDLK_END) {
1495	$self->{cursor} = length $text;	1624	$self->{cursor} = length $text;
1496	} elsif ($sym == 27) {	1625	} elsif ($uni == 27) {
1497	$self->emit ('escape');	1626	$self->_emit ('escape');
1498	} elsif ($uni) {	1627	} elsif ($uni) {
1499	substr $text, $self->{cursor}++, 0, chr $uni;	1628	substr $text, $self->{cursor}++, 0, chr $uni;
1500	}	1629	}
1501		1630
1502	$self->_set_text ($text);	1631	$self->_set_text ($text);
1503	$self->update;	1632	$self->update;
		1633	$self->check_size;
1504	}	1634	}
1505		1635
1506	sub focus_in {	1636	sub focus_in {
1507	my ($self) = @_;	1637	my ($self) = @_;
1508		1638
…		…
1588	if ($sym == 13) {	1718	if ($sym == 13) {
1589	unshift @{$self->{history}},	1719	unshift @{$self->{history}},
1590	my $txt = $self->get_text;	1720	my $txt = $self->get_text;
1591	$self->{history_pointer} = -1;	1721	$self->{history_pointer} = -1;
1592	$self->{history_saveback} = '';	1722	$self->{history_saveback} = '';
1593	$self->emit (activate => $txt);	1723	$self->_emit (activate => $txt);
1594	$self->update;	1724	$self->update;
1595		1725
1596	} elsif ($sym == CFClient::SDLK_UP) {	1726	} elsif ($sym == CFClient::SDLK_UP) {
1597	if ($self->{history_pointer} < 0) {	1727	if ($self->{history_pointer} < 0) {
1598	$self->{history_saveback} = $self->get_text;	1728	$self->{history_saveback} = $self->get_text;
…		…
1637	my $class = shift;	1767	my $class = shift;
1638		1768
1639	$class->SUPER::new (	1769	$class->SUPER::new (
1640	padding => 4,	1770	padding => 4,
1641	fg => [1, 1, 1],	1771	fg => [1, 1, 1],
1642	bg => [1, 1, 1, 0.2],
1643	active_fg => [0, 0, 1],	1772	active_fg => [0, 0, 1],
1644	can_hover => 1,	1773	can_hover => 1,
1645	align => 0,	1774	align => 0,
1646	valign => 0,	1775	valign => 0,
1647	can_events => 1,	1776	can_events => 1,
1648	@_	1777	@_
1649	)	1778	)
1650	}	1779	}
1651		1780
		1781	sub activate { }
		1782
1652	sub button_up {	1783	sub button_up {
1653	my ($self, $ev, $x, $y) = @_;	1784	my ($self, $ev, $x, $y) = @_;
1654		1785
		1786	$self->emit ("activate")
1655	if ($x >= 0 && $x < $self->{w}	1787	if $x >= 0 && $x < $self->{w}
1656	&& $y >= 0 && $y < $self->{h}) {	1788	&& $y >= 0 && $y < $self->{h};
1657	$self->emit ("activate");
1658	}
1659	}	1789	}
1660		1790
1661	sub _draw {	1791	sub _draw {
1662	my ($self) = @_;	1792	my ($self) = @_;
1663		1793
…		…
1665		1795
1666	if ($GRAB == $self) {	1796	if ($GRAB == $self) {
1667	$self->{fg} = $self->{active_fg};	1797	$self->{fg} = $self->{active_fg};
1668	}	1798	}
1669		1799
1670	glEnable GL_BLEND;
1671	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672	glEnable GL_TEXTURE_2D;	1800	glEnable GL_TEXTURE_2D;
1673	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1801	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674	glColor 0, 0, 0, 1;	1802	glColor 0, 0, 0, 1;
1675		1803
1676	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1804	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677		1805
1678	glDisable GL_TEXTURE_2D;	1806	glDisable GL_TEXTURE_2D;
1679	glDisable GL_BLEND;
1680		1807
1681	$self->SUPER::_draw;	1808	$self->SUPER::_draw;
1682	}	1809	}
1683		1810
1684	#############################################################################	1811	#############################################################################
…		…
1698		1825
1699	$class->SUPER::new (	1826	$class->SUPER::new (
1700	padding => 2,	1827	padding => 2,
1701	fg => [1, 1, 1],	1828	fg => [1, 1, 1],
1702	active_fg => [1, 1, 0],	1829	active_fg => [1, 1, 0],
		1830	bg => [0, 0, 0, 0.2],
		1831	active_bg => [1, 1, 1, 0.5],
1703	state => 0,	1832	state => 0,
1704	can_hover => 1,	1833	can_hover => 1,
1705	@_	1834	@_
1706	)	1835	)
1707	}	1836	}
…		…
1716	my ($self, $ev, $x, $y) = @_;	1845	my ($self, $ev, $x, $y) = @_;
1717		1846
1718	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1847	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1719	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1848	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1720	$self->{state} = !$self->{state};	1849	$self->{state} = !$self->{state};
1721	$self->emit (changed => $self->{state});	1850	$self->_emit (changed => $self->{state});
1722	}	1851	}
1723	}	1852	}
1724		1853
1725	sub _draw {	1854	sub _draw {
1726	my ($self) = @_;	1855	my ($self) = @_;
…		…
1731		1860
1732	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1861	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1733		1862
1734	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1863	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735		1864
1736	glEnable GL_BLEND;	1865	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1866
1737	glEnable GL_TEXTURE_2D;	1867	glEnable GL_TEXTURE_2D;
1738	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1739
1740	my $tex = $self->{state} ? $tex[1] : $tex[0];
1741
1742	$tex->draw_quad (0, 0, $s, $s);	1868	$tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744	glDisable GL_TEXTURE_2D;	1869	glDisable GL_TEXTURE_2D;
1745	glDisable GL_BLEND;
1746	}	1870	}
1747		1871
1748	#############################################################################	1872	#############################################################################
1749		1873
1750	package CFClient::UI::Image;	1874	package CFClient::UI::Image;
…		…
1793	glTranslate 0, -$self->{w}, 0;	1917	glTranslate 0, -$self->{w}, 0;
1794		1918
1795	($w, $h) = ($h, $w);	1919	($w, $h) = ($h, $w);
1796	}	1920	}
1797		1921
1798	glEnable GL_BLEND;
1799	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800	glEnable GL_TEXTURE_2D;	1922	glEnable GL_TEXTURE_2D;
1801	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1923	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802		1924
1803	$tex->draw_quad (0, 0, $w, $h);	1925	$tex->draw_quad_alpha (0, 0, $w, $h);
1804		1926
1805	glDisable GL_BLEND;
1806	glDisable GL_TEXTURE_2D;	1927	glDisable GL_TEXTURE_2D;
1807	}	1928	}
1808		1929
1809	#############################################################################	1930	#############################################################################
1810		1931
…		…
1999	qw(s1_slider.png s1_slider_bg.png);	2120	qw(s1_slider.png s1_slider_bg.png);
2000		2121
2001	sub new {	2122	sub new {
2002	my $class = shift;	2123	my $class = shift;
2003		2124
2004	# range [value, low, high, page]	2125	# range [value, low, high, page, unit]
2005		2126
2006	# TODO: 0-width page	2127	# TODO: 0-width page
2007	# TODO: req_w/h are wrong with vertical	2128	# TODO: req_w/h are wrong with vertical
2008	# TODO: calculations are off	2129	# TODO: calculations are off
2009	my $self = $class->SUPER::new (	2130	my $self = $class->SUPER::new (
2010	fg => [1, 1, 1],	2131	fg => [1, 1, 1],
2011	active_fg => [0, 0, 0],	2132	active_fg => [0, 0, 0],
		2133	bg => [0, 0, 0, 0.2],
		2134	active_bg => [1, 1, 1, 0.5],
2012	range => [0, 0, 100, 10],	2135	range => [0, 0, 100, 10, 0],
2013	req_w => $::WIDTH / 80,	2136	req_w => $::WIDTH / 80,
2014	req_h => $::WIDTH / 80,	2137	req_h => $::WIDTH / 80,
2015	vertical => 0,	2138	vertical => 0,
2016	can_hover => 1,	2139	can_hover => 1,
2017	inner_pad => 5,	2140	inner_pad => 0.02,
2018	@_	2141	@_
2019	);	2142	);
2020		2143
		2144	$self->set_value ($self->{range}[0]);
		2145	$self->update;
		2146
2021	$self	2147	$self
		2148	}
		2149
		2150	sub set_range {
		2151	my ($self, $range) = @_;
		2152
		2153	($range, $self->{range}) = ($self->{range}, $range);
		2154
		2155	$self->update
		2156	if "@$range" ne "@{$self->{range}}";
		2157	}
		2158
		2159	sub set_value {
		2160	my ($self, $value) = @_;
		2161
		2162	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2163
		2164	$hi = $lo + 1 if $hi <= $lo;
		2165
		2166	$page = $hi - $lo if $page > $hi - $lo;
		2167
		2168	$value = $lo if $value < $lo;
		2169	$value = $hi - $page if $value > $hi - $page;
		2170
		2171	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2172	if $unit;
		2173
		2174	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2175
		2176	if ($value != $old_value) {
		2177	$self->_emit (changed => $value);
		2178	$self->update;
		2179	}
2022	}	2180	}
2023		2181
2024	sub size_request {	2182	sub size_request {
2025	my ($self) = @_;	2183	my ($self) = @_;
2026		2184
…		…
2032		2190
2033	sub button_down {	2191	sub button_down {
2034	my ($self, $ev, $x, $y) = @_;	2192	my ($self, $ev, $x, $y) = @_;
2035		2193
2036	$self->SUPER::button_down ($ev, $x, $y);	2194	$self->SUPER::button_down ($ev, $x, $y);
		2195
		2196	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2197
2037	$self->mouse_motion ($ev, $x, $y);	2198	$self->mouse_motion ($ev, $x, $y);
2038	}	2199	}
2039		2200
2040	sub mouse_motion {	2201	sub mouse_motion {
2041	my ($self, $ev, $x, $y) = @_;	2202	my ($self, $ev, $x, $y) = @_;
2042		2203
2043	if ($GRAB == $self) {	2204	if ($GRAB == $self) {
		2205	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2206
		2207	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2208
		2209	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2210
		2211	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2212	}
		2213	}
		2214
		2215	sub update {
		2216	my ($self) = @_;
		2217
		2218	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2219	$self->set_value ($self->{range}[0]);
		2220
2044	my ($value, $lo, $hi, $page) = @{$self->{range}};	2221	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2222	my $range = ($hi - $page - $lo) || 1e-100;
2045		2223
2046	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2224	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2047		2225
2048	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2226	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2049	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2227	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2050		2228
2051	$x -= $inner_pad_px; # substract the padding	2229	$value = ($value - $lo) / $range;
2052	$x = $x * ($hi - $lo) / $inner_w + $lo;	2230	$value = $value * $self->{scale} + $self->{offset};
2053	$x = $lo if $x < $lo;
2054	$x = $hi - $page if $x > $hi - $page;
2055	$self->{range}[0] = $x;
2056		2231
2057	$self->emit (changed => $x);	2232	$self->{knob_x} = $value - $knob_w * 0.5;
2058	$self->update;	2233	$self->{knob_w} = $knob_w;
2059	}	2234	});
2060	}
2061		2235
2062	# the inner_* stuff is for generating a padding for the slider handle,	2236	$self->SUPER::update;
2063	# so that the handle doesn't leave the texture. This calculation isn't 100%
2064	# correct propably, but it does the job for now
2065	sub _calc_inner_pad_px {
2066	my ($self, $w) = @_;
2067	($w / 100) * $self->{inner_pad} # % to pixels
2068	}	2237	}
2069		2238
2070	sub _draw {	2239	sub _draw {
2071	my ($self) = @_;	2240	my ($self) = @_;
2072		2241
2073	$self->SUPER::_draw ();	2242	$self->SUPER::_draw ();
2074		2243
2075	my ($w, $h) = @$self{qw(w h)};	2244	glScale $self->{w}, $self->{h};
2076		2245
2077	if ($self->{vertical}) {	2246	if ($self->{vertical}) {
2078	# draw a vertical slider like a rotated horizontal slider	2247	# draw a vertical slider like a rotated horizontal slider
2079		2248
		2249	glTranslate 1, 0, 0;
2080	glRotate 90, 0, 0, 1;	2250	glRotate 90, 0, 0, 1;
2081	glTranslate 0, -$self->{w}, 0;
2082
2083	($w, $h) = ($h, $w);
2084	}	2251	}
2085		2252
2086	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2253	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2254	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088		2255
2089	my ($value, $lo, $hi, $page) = @{$self->{range}};
2090
2091	$hi = $value + 1 if $lo == $hi;
2092
2093	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2094	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2095
2096	$page = int $page * $inner_w / ($hi - $lo);
2097	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2098
2099	$w -= $page;
2100	$page &= ~1;
2101	glTranslate $page * 0.5, 0, 0;
2102	$page ||= 2;
2103
2104	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2105	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2106
2107	glEnable GL_BLEND;
2108	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2109	glEnable GL_TEXTURE_2D;	2256	glEnable GL_TEXTURE_2D;
2110	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2257	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111		2258
2112	# draw background	2259	# draw background
2113	$tex[1]->draw_quad (0, 0, $w, $h);	2260	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114		2261
2115	# draw handle	2262	# draw handle
2116	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2263	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2117		2264
2118	glDisable GL_BLEND;
2119	glDisable GL_TEXTURE_2D;	2265	glDisable GL_TEXTURE_2D;
2120	}	2266	}
		2267
		2268	#############################################################################
		2269
		2270	package CFClient::UI::ValSlider;
		2271
		2272	our @ISA = CFClient::UI::HBox::;
		2273
		2274	sub new {
		2275	my ($class, %arg) = @_;
		2276
		2277	my $range = delete $arg{range};
		2278
		2279	my $self = $class->SUPER::new (
		2280	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2281	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2282	to_value => sub { shift },
		2283	from_value => sub { shift },
		2284	%arg,
		2285	);
		2286
		2287	$self->{slider}->connect (changed => sub {
		2288	my ($self, $value) = @_;
		2289	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2290	$self->{parent}->emit (changed => $value);
		2291	});
		2292
		2293	# $self->{entry}->connect (changed => sub {
		2294	# my ($self, $value) = @_;
		2295	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2296	# $self->{parent}->emit (changed => $value);
		2297	# });
		2298
		2299	$self->add ($self->{slider}, $self->{entry});
		2300
		2301	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2302
		2303	$self
		2304	}
		2305
		2306	sub set_range { shift->{slider}->set_range (@_) }
		2307	sub set_value { shift->{slider}->set_value (@_) }
2121		2308
2122	#############################################################################	2309	#############################################################################
2123		2310
2124	package CFClient::UI::TextView;	2311	package CFClient::UI::TextView;
2125		2312
…		…
2134	fontsize => 1,	2321	fontsize => 1,
2135	can_events => 0,	2322	can_events => 0,
2136	#font => default_font	2323	#font => default_font
2137	@_,	2324	@_,
2138		2325
2139	layout => (new CFClient::Layout),	2326	layout => (new CFClient::Layout 1),
2140	par => [],	2327	par => [],
2141	height => 0,	2328	height => 0,
2142	children => [	2329	children => [
2143	(new CFClient::UI::Empty expand => 1),	2330	(new CFClient::UI::Empty expand => 1),
2144	(new CFClient::UI::Slider vertical => 1),	2331	(new CFClient::UI::Slider vertical => 1),
…		…
2155		2342
2156	$self->{fontsize} = $fontsize;	2343	$self->{fontsize} = $fontsize;
2157	$self->reflow;	2344	$self->reflow;
2158	}	2345	}
2159		2346
2160	sub text_height {
2161	my ($self, $text) = @_;
2162
2163	my $layout = $self->{layout};
2164
2165	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166	$layout->set_width ($self->{children}[0]{w});
2167	$layout->set_text ($text);
2168
2169	($layout->size)[1]
2170	}
2171
2172	sub reflow {
2173	my ($self) = @_;
2174
2175	$self->{need_reflow}++;
2176	$self->update;
2177	}
2178
2179	sub size_allocate {	2347	sub size_allocate {
2180	my ($self, $w, $h) = @_;	2348	my ($self, $w, $h) = @_;
2181		2349
2182	$self->SUPER::size_allocate ($w, $h);	2350	$self->SUPER::size_allocate ($w, $h);
2183		2351
…		…
2186	$self->{layout}->set_width ($self->{children}[0]{w});	2354	$self->{layout}->set_width ($self->{children}[0]{w});
2187		2355
2188	$self->reflow;	2356	$self->reflow;
2189	}	2357	}
2190		2358
		2359	sub text_size {
		2360	my ($self, $text, $indent) = @_;
		2361
		2362	my $layout = $self->{layout};
		2363
		2364	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2365	$layout->set_width ($self->{children}[0]{w} - $indent);
		2366	$layout->set_markup ($text);
		2367
		2368	$layout->size
		2369	}
		2370
		2371	sub reflow {
		2372	my ($self) = @_;
		2373
		2374	$self->{need_reflow}++;
		2375	$self->update;
		2376	}
		2377
		2378	sub set_offset {
		2379	my ($self, $offset) = @_;
		2380
		2381	# todo: base offset on lines or so, not on pixels
		2382	$self->{children}[1]->set_value ($offset);
		2383	}
		2384
		2385	sub clear {
		2386	my ($self) = @_;
		2387
		2388	$self->{par} = [];
		2389	$self->{height} = 0;
		2390	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2391	}
		2392
2191	sub add_paragraph {	2393	sub add_paragraph {
2192	my ($self, $color, $text) = @_;	2394	my ($self, $color, $text, $indent) = @_;
2193		2395
2194	#TODO: intelligently "reformat" paragraph	2396	for my $line (split /\n/, $text) {
2195		2397	my ($w, $h) = $self->text_size ($line);
2196	my $height = $self->text_height ($text);
2197
2198	$self->{height} += $height;	2398	$self->{height} += $h;
		2399	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2400	}
2199		2401
2200	push @{$self->{par}}, [$height, $color, $text];
2201
2202	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2402	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2203	$self->{children}[1]->update;
2204	}	2403	}
2205		2404
2206	sub update {	2405	sub update {
2207	my ($self) = @_;	2406	my ($self) = @_;
2208		2407
…		…
2210		2409
2211	return unless $self->{h} > 0;	2410	return unless $self->{h} > 0;
2212		2411
2213	delete $self->{texture};	2412	delete $self->{texture};
2214		2413
2215	$ROOT->on_refresh ($self, sub {	2414	$ROOT->on_post_alloc ($self, sub {
		2415	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2416
2216	if (delete $self->{need_reflow}) {	2417	if (delete $self->{need_reflow}) {
2217	my $height = 0;	2418	my $height = 0;
2218		2419
2219	$height += $_->[0] = $self->text_height ($_->[2])	2420	my $layout = $self->{layout};
		2421
		2422	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2423
2220	for @{$self->{par}};	2424	for (@{$self->{par}}) {
		2425	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2426	$layout->set_width ($W - $_->[3]);
		2427	$layout->set_markup ($_->[4]);
		2428	my ($w, $h) = $layout->size;
		2429	$_->[0] = $w + $_->[3];
		2430	$_->[1] = $h;
		2431	}
		2432
		2433	$height += $_->[1];
		2434	}
2221		2435
2222	$self->{height} = $height;	2436	$self->{height} = $height;
2223		2437
2224	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2438	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2225		2439
2226	delete $self->{texture};	2440	delete $self->{texture};
2227	}	2441	}
2228		2442
2229	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2443	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2230	glClearColor 0, 0, 0, 0;	2444	glClearColor 0.5, 0.5, 0.5, 0;
2231	glClear GL_COLOR_BUFFER_BIT;	2445	glClear GL_COLOR_BUFFER_BIT;
2232		2446
		2447	my $top = int $self->{children}[1]{range}[0];
		2448
		2449	my $y0 = $top;
		2450	my $y1 = $top + $H;
		2451
		2452	my $y = 0;
		2453
		2454	my $layout = $self->{layout};
		2455
		2456	$layout->set_font ($self->{font}) if $self->{font};
		2457
2233	glEnable GL_BLEND;	2458	glEnable GL_BLEND;
		2459	#TODO# not correct in windows where rgba is forced off
2234	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2460	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2235	glEnable GL_TEXTURE_2D;
2236	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237
2238	my $top = int $self->{children}[1]{range}[0];
2239
2240	my $y0 = $top;
2241	my $y1 = $top + $self->{h};
2242
2243	my $y = 0;
2244
2245	my $layout = $self->{layout};
2246
2247	$layout->set_font ($self->{font}) if $self->{font};
2248		2461
2249	for my $par (@{$self->{par}}) {	2462	for my $par (@{$self->{par}}) {
2250	my $h = $par->[0];	2463	my $h = $par->[1];
2251		2464
2252	if ($y0 < $y + $h && $y < $y1) {	2465	if ($y0 < $y + $h && $y < $y1) {
		2466	$layout->set_foreground (@{ $par->[2] });
		2467	$layout->set_width ($W - $par->[3]);
2253	$layout->set_text ($par->[2]);	2468	$layout->set_markup ($par->[4]);
2254		2469
2255	glColor @{ $par->[1] };	2470	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2256	my ($W, $H) = $layout->size;	2471
2257	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2472	glRasterPos $par->[3], $y - $y0;
		2473	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2258	}	2474	}
2259		2475
2260	$y += $h;	2476	$y += $h;
2261	}	2477	}
2262		2478
2263	glDisable GL_TEXTURE_2D;
2264	glDisable GL_BLEND;	2479	glDisable GL_BLEND;
2265	};	2480	};
2266	});	2481	});
2267	}	2482	}
2268		2483
2269	sub _draw {	2484	sub _draw {
2270	my ($self) = @_;	2485	my ($self) = @_;
2271		2486
2272	glEnable GL_BLEND;
2273	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274	glEnable GL_TEXTURE_2D;	2487	glEnable GL_TEXTURE_2D;
2275	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2488	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276	glColor 1, 1, 1, 1;	2489	glColor 1, 1, 1, 1;
2277	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2490	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278	glDisable GL_TEXTURE_2D;	2491	glDisable GL_TEXTURE_2D;
2279	glDisable GL_BLEND;
2280		2492
2281	$self->{children}[1]->draw;	2493	$self->{children}[1]->draw;
2282		2494
2283	}	2495	}
2284		2496
…		…
2352		2564
2353	# TODO: use animation	2565	# TODO: use animation
2354	if ($self->{state} = !$self->{state}) {	2566	if ($self->{state} = !$self->{state}) {
2355	$CFClient::UI::ROOT->add ($self->{other});	2567	$CFClient::UI::ROOT->add ($self->{other});
2356	$self->{other}->move ($self->coord2global (0, $self->{h}));	2568	$self->{other}->move ($self->coord2global (0, $self->{h}));
2357	$self->emit ("open");	2569	$self->_emit ("open");
2358	} else {	2570	} else {
2359	$CFClient::UI::ROOT->remove ($self->{other});	2571	$CFClient::UI::ROOT->remove ($self->{other});
2360	$self->emit ("close");	2572	$self->_emit ("close");
2361	}	2573	}
2362		2574
2363	$self->emit (changed => $self->{state});	2575	$self->_emit (changed => $self->{state});
2364	}	2576	}
2365		2577
2366	#############################################################################	2578	#############################################################################
2367		2579
2368	package CFClient::UI::Tooltip;	2580	package CFClient::UI::Tooltip;
…		…
2378	@_,	2590	@_,
2379	can_events => 0,	2591	can_events => 0,
2380	)	2592	)
2381	}	2593	}
2382		2594
2383	sub set_markup {	2595	sub set_tooltip_from {
2384	my ($self, $text) = @_;	2596	my ($self, $widget) = @_;
2385		2597
2386	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2598	$self->add (new CFClient::UI::Label
2387	$self->{label}->set_markup ($text);	2599	markup => $widget->{tooltip},
2388	$self->add ($self->{label});	2600	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2601	fontsize => 0.8,
		2602	fg => [0, 0, 0, 1],
		2603	ellipsise => 0,
		2604	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2605	);
2389	}	2606	}
2390		2607
2391	sub size_request {	2608	sub size_request {
2392	my ($self) = @_;	2609	my ($self) = @_;
2393
2394	$self->child->set_max_size ($::WIDTH * 0.3);
2395		2610
2396	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2611	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397		2612
2398	($w + 4, $h + 4)	2613	($w + 4, $h + 4)
2399	}	2614	}
…		…
2405	}	2620	}
2406		2621
2407	sub _draw {	2622	sub _draw {
2408	my ($self) = @_;	2623	my ($self) = @_;
2409		2624
2410	glPushMatrix;
2411	glTranslate 0.375, 0.375;	2625	glTranslate 0.375, 0.375;
2412		2626
2413	my ($w, $h) = @$self{qw(w h)};	2627	my ($w, $h) = @$self{qw(w h)};
2414		2628
2415	glColor 1, 0.8, 0.4;	2629	glColor 1, 0.8, 0.4;
…		…
2426	glVertex 0 , $h;	2640	glVertex 0 , $h;
2427	glVertex $w, $h;	2641	glVertex $w, $h;
2428	glVertex $w, 0;	2642	glVertex $w, 0;
2429	glEnd;	2643	glEnd;
2430		2644
2431	glPopMatrix;	2645	glTranslate 2 - 0.375, 2 - 0.375;
2432
2433	glTranslate 2, 2;
2434	$self->SUPER::_draw;	2646	$self->SUPER::_draw;
2435	}	2647	}
2436		2648
2437	#############################################################################	2649	#############################################################################
2438		2650
…		…
2443	use CFClient::OpenGL;	2655	use CFClient::OpenGL;
2444		2656
2445	sub new {	2657	sub new {
2446	my $class = shift;	2658	my $class = shift;
2447		2659
2448	$class->SUPER::new (	2660	my $self = $class->SUPER::new (
2449	aspect => 1,	2661	aspect => 1,
		2662	can_events => 0,
2450	@_,	2663	@_,
2451	)	2664	);
		2665
		2666	if ($self->{anim} && $self->{animspeed}) {
		2667	Scalar::Util::weaken (my $widget = $self);
		2668
		2669	$self->{timer} = Event->timer (
		2670	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2671	hard => 1,
		2672	interval => $self->{animspeed},
		2673	cb => sub {
		2674	++$widget->{frame};
		2675	$widget->update;
		2676	},
		2677	);
		2678	}
		2679
		2680	$self
2452	}	2681	}
2453		2682
2454	sub size_request {	2683	sub size_request {
2455	(32, 8)	2684	(32, 8)
2456	}	2685	}
2457		2686
		2687	sub update {
		2688	my ($self) = @_;
		2689
		2690	return unless $self->{visible};
		2691
		2692	$self->SUPER::update;
		2693	}
		2694
2458	sub _draw {	2695	sub _draw {
2459	my ($self) = @_;	2696	my ($self) = @_;
2460		2697
2461	return unless $::CONN;#d# manage and cache textures differently	2698	return unless $::CONN;
		2699
		2700	my $face;
		2701
		2702	if ($self->{frame}) {
		2703	my $anim = $::CONN->{anim}[$self->{anim}];
		2704
		2705	$face = $anim->[ $self->{frame} % @$anim ]
		2706	if $anim && @$anim;
		2707	}
		2708
2462	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2709	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2463		2710
2464	# TODO animation
2465	if ($tex) {	2711	if ($tex) {
2466	glEnable GL_BLEND;
2467	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468	glEnable GL_TEXTURE_2D;	2712	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2713	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2714	glColor 1, 1, 1, 1;
2471	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2715	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2716	glDisable GL_TEXTURE_2D;
2473	glDisable GL_BLEND;
2474	}	2717	}
		2718	}
		2719
		2720	sub DESTROY {
		2721	my ($self) = @_;
		2722
		2723	$self->{timer}->cancel
		2724	if $self->{timer};
		2725
		2726	$self->SUPER::DESTROY;
2475	}	2727	}
2476		2728
2477	#############################################################################	2729	#############################################################################
2478		2730
2479	package CFClient::UI::InventoryItem;	2731	package CFClient::UI::Inventory;
2480		2732
2481	our @ISA = CFClient::UI::HBox::;	2733	our @ISA = CFClient::UI::ScrolledWindow::;
2482		2734
2483	sub new {	2735	sub new {
2484	my $class = shift;	2736	my $class = shift;
2485		2737
2486	my %args = @_;
2487
2488	my $item = delete $args{item};
2489
2490	my $desc = $item->{nrof} < 2
2491	? $item->{name}
2492	: "$item->{nrof} $item->{name_pl}";
2493
2494
2495	my $self = $class->SUPER::new (	2738	my $self = $class->SUPER::new (
2496	can_hover => 1,	2739	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2497	can_events => 1,
2498	tooltip => (CFClient::UI::Label->escape ($desc)
2499	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500	connect_button_down => sub {
2501	my ($self, $ev, $x, $y) = @_;
2502
2503	# todo: maybe put examine on 1? but should just be a tooltip :(
2504	if ($ev->{button} == 1) {
2505	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506	} elsif ($ev->{button} == 2) {
2507	$::CONN->send ("apply $item->{tag}");
2508	} elsif ($ev->{button} == 3) {
2509	CFClient::UI::Menu->new (
2510	items => [
2511	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512	[
2513	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514	sub { $::CONN->send ("lock $item->{tag}") },
2515	],
2516	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519	],
2520	)->popup ($ev);
2521	}
2522
2523	1
2524	},
2525	%args
2526	);
2527
2528	$self->add (new CFClient::UI::Face
2529	can_events => 0,
2530	face => $item->{face},
2531	anim => $item->{anim},
2532	animspeed => $item->{animspeed},
2533	);
2534
2535	$self->add (new CFClient::UI::Label
2536	can_events => 0,
2537	text => $desc,
2538	);
2539
2540	$self
2541	}
2542
2543	#############################################################################
2544
2545	package CFClient::UI::Inventory;
2546
2547	our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549	sub new {
2550	my $class = shift;
2551
2552	my $self = $class->SUPER::new (
2553	scrolled => (new CFClient::UI::VBox),
2554	@_,	2740	@_,
2555	);	2741	);
2556		2742
2557	$self	2743	$self
2558	}	2744	}
…		…
2561	my ($self, $items) = @_;	2747	my ($self, $items) = @_;
2562		2748
2563	$self->{scrolled}->clear;	2749	$self->{scrolled}->clear;
2564	return unless $items;	2750	return unless $items;
2565		2751
2566	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2752	my @items = sort {
		2753	($a->{type} <=> $b->{type})
		2754	or ($a->{name} cmp $b->{name})
		2755	} @$items;
2567		2756
2568	$self->{real_items} = \@items;	2757	$self->{real_items} = \@items;
2569		2758
		2759	my $row = 0;
2570	for my $item (@items) {	2760	for my $item (@items) {
2571	my $desc = $item->{nrof} < 2	2761	CFClient::Item::update_widgets $item;
2572	? $item->{name}
2573	: "$item->{nrof} $item->{name_pl}";
2574		2762
2575	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2763	$self->{scrolled}->add (0, $row, $item->{face_widget});
2576	}	2764	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2765	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2577		2766
2578	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2767	$row++;
		2768	}
2579	}	2769	}
2580		2770
2581	sub size_request {	2771	sub size_request {
2582	my ($self) = @_;	2772	my ($self) = @_;
2583	($self->{req_w}, $self->{req_h});	2773	($self->{req_w}, $self->{req_h});
…		…
2623		2813
2624	# popup given the event (must be a mouse button down event currently)	2814	# popup given the event (must be a mouse button down event currently)
2625	sub popup {	2815	sub popup {
2626	my ($self, $ev) = @_;	2816	my ($self, $ev) = @_;
2627		2817
2628	$self->emit ("popdown");	2818	$self->_emit ("popdown");
2629		2819
2630	# maybe save $GRAB? must be careful about events...	2820	# maybe save $GRAB? must be careful about events...
2631	$GRAB = $self;	2821	$GRAB = $self;
2632	$self->{button} = $ev->{button};	2822	$self->{button} = $ev->{button};
2633		2823
…		…
2648		2838
2649	if ($ev->{button} == $self->{button}) {	2839	if ($ev->{button} == $self->{button}) {
2650	undef $GRAB;	2840	undef $GRAB;
2651	$self->hide;	2841	$self->hide;
2652		2842
2653	$self->emit ("popdown");	2843	$self->_emit ("popdown");
2654	$self->{hover}[1]->() if $self->{hover};	2844	$self->{hover}[1]->() if $self->{hover};
2655	}	2845	}
2656	}	2846	}
2657		2847
2658	#############################################################################	2848	#############################################################################
2659		2849
2660	package CFClient::UI::Root;	2850	package CFClient::UI::Statusbox;
2661		2851
2662	our @ISA = CFClient::UI::Container::;	2852	our @ISA = CFClient::UI::VBox::;
2663
2664	use CFClient::OpenGL;
2665		2853
2666	sub new {	2854	sub new {
2667	my $class = shift;	2855	my $class = shift;
2668		2856
2669	$class->SUPER::new (	2857	$class->SUPER::new (
		2858	fontsize => 0.8,
2670	@_,	2859	@_,
2671	)	2860	)
2672	}	2861	}
2673		2862
		2863	sub reorder {
		2864	my ($self) = @_;
		2865	my $NOW = time;
		2866
		2867	while (my ($k, $v) = each %{ $self->{item} }) {
		2868	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2869	}
		2870
		2871	my @widgets;
		2872
		2873	my @items = sort {
		2874	$a->{pri} <=> $b->{pri}
		2875	or $b->{id} <=> $a->{id}
		2876	} values %{ $self->{item} };
		2877
		2878	my $count = 10 + 1;
		2879	for my $item (@items) {
		2880	last unless --$count;
		2881
		2882	push @widgets, $item->{label} ||= do {
		2883	# TODO: doesn't handle markup well (read as: at all)
		2884	my $short = $item->{count} > 1
		2885	? "<b>$item->{count} ×</b> $item->{text}"
		2886	: $item->{text};
		2887
		2888	for ($short) {
		2889	s/^\s+//;
		2890	s/\s+/ /g;
		2891	}
		2892
		2893	new CFClient::UI::Label
		2894	markup => $short,
		2895	tooltip => $item->{tooltip},
		2896	tooltip_font => $::FONT_PROP,
		2897	tooltip_width => 0.67,
		2898	fontsize => $item->{fontsize} || $self->{fontsize},
		2899	max_w => $::WIDTH * 0.44,
		2900	fg => $item->{fg},
		2901	can_events => 1,
		2902	can_hover => 1
		2903	};
		2904	}
		2905
		2906	$self->clear;
		2907	$self->SUPER::add (reverse @widgets);
		2908	}
		2909
		2910	sub add {
		2911	my ($self, $text, %arg) = @_;
		2912
		2913	$text =~ s/^\s+//;
		2914	$text =~ s/\s+$//;
		2915
		2916	return unless $text;
		2917
		2918	my $timeout = time + ((delete $arg{timeout}) || 60);
		2919
		2920	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2921
		2922	if (my $item = $self->{item}{$group}) {
		2923	if ($item->{text} eq $text) {
		2924	$item->{count}++;
		2925	} else {
		2926	$item->{count} = 1;
		2927	$item->{text} = $item->{tooltip} = $text;
		2928	}
		2929	$item->{id} = ++$self->{id};
		2930	$item->{timeout} = $timeout;
		2931	delete $item->{label};
		2932	} else {
		2933	$self->{item}{$group} = {
		2934	id => ++$self->{id},
		2935	text => $text,
		2936	timeout => $timeout,
		2937	tooltip => $text,
		2938	fg => [0.8, 0.8, 0.8, 0.8],
		2939	pri => 0,
		2940	count => 1,
		2941	%arg,
		2942	};
		2943	}
		2944
		2945	$self->reorder;
		2946	}
		2947
		2948	sub reconfigure {
		2949	my ($self) = @_;
		2950
		2951	delete $_->{label}
		2952	for values %{ $self->{item} || {} };
		2953
		2954	$self->reorder;
		2955	$self->SUPER::reconfigure;
		2956	}
		2957
		2958	#############################################################################
		2959
		2960	package CFClient::UI::Root;
		2961
		2962	our @ISA = CFClient::UI::Container::;
		2963
		2964	use CFClient::OpenGL;
		2965
		2966	sub new {
		2967	my $class = shift;
		2968
		2969	$class->SUPER::new (
		2970	visible => 1,
		2971	@_,
		2972	)
		2973	}
		2974
2674	sub configure {	2975	sub configure {
2675	my ($self, $x, $y, $w, $h) = @_;	2976	my ($self, $x, $y, $w, $h) = @_;
2676		2977
2677	$self->{w} = $w;	2978	$self->{w} = $w;
2678	$self->{h} = $h;	2979	$self->{h} = $h;
…		…
2692	}	2993	}
2693		2994
2694	sub size_allocate {	2995	sub size_allocate {
2695	my ($self, $w, $h) = @_;	2996	my ($self, $w, $h) = @_;
2696		2997
2697	my $old_w = $self->{old_w};
2698	my $old_h = $self->{old_h};
2699
2700	if ($old_w && $old_h) {
2701	for my $child ($self->children) {
2702	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710	}
2711	}
2712
2713	for my $child ($self->children) {	2998	for my $child ($self->children) {
2714	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2999	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715		3000
		3001	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3002	if exists $child->{req_x};
		3003
		3004	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3005	if exists $child->{req_y};
		3006
2716	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3007	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2717	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3008	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3009
2718	$child->configure ($X, $Y, $W, $H);	3010	$child->configure ($X, $Y, $W, $H);
2719	}	3011	}
2720
2721	$self->{old_w} = $w;
2722	$self->{old_h} = $h;
2723	}	3012	}
2724		3013
2725	sub coord2local {	3014	sub coord2local {
2726	my ($self, $x, $y) = @_;	3015	my ($self, $x, $y) = @_;
2727		3016
…		…
2740	$self->check_size;	3029	$self->check_size;
2741	$::WANT_REFRESH++;	3030	$::WANT_REFRESH++;
2742	}	3031	}
2743		3032
2744	sub add {	3033	sub add {
2745	my ($self, $child) = @_;	3034	my ($self, @children) = @_;
2746		3035
		3036	for (my @widgets = @children; my $w = pop @widgets; ) {
		3037	push @widgets, $w->children;
		3038	$w->{root} = $self;
		3039	$w->{visible} = $self->{visible} + 1;
		3040	}
		3041
		3042	for my $child (@children) {
		3043	$child->{is_toplevel} = 1;
		3044
2747	# integerise window positions	3045	# integerise window positions
2748	$child->{x} = int $child->{x};	3046	$child->{x} = int $child->{x};
2749	$child->{y} = int $child->{y};	3047	$child->{y} = int $child->{y};
		3048	}
2750		3049
2751	$self->SUPER::add ($child);	3050	$self->SUPER::add (@children);
		3051	}
		3052
		3053	sub remove {
		3054	my ($self, @children) = @_;
		3055
		3056	$self->SUPER::remove (@children);
		3057
		3058	while (@children) {
		3059	my $w = pop @children;
		3060	push @children, $w->children;
		3061	$w->set_invisible;
		3062	}
2752	}	3063	}
2753		3064
2754	sub on_refresh {	3065	sub on_refresh {
2755	my ($self, $id, $cb) = @_;	3066	my ($self, $id, $cb) = @_;
2756		3067
2757	$self->{refresh_hook}{$id} = $cb;	3068	$self->{refresh_hook}{$id} = $cb;
2758	}	3069	}
2759		3070
		3071	sub on_post_alloc {
		3072	my ($self, $id, $cb) = @_;
		3073
		3074	$self->{post_alloc_hook}{$id} = $cb;
		3075	}
		3076
2760	sub draw {	3077	sub draw {
2761	my ($self) = @_;	3078	my ($self) = @_;
		3079
		3080	while ($self->{refresh_hook}) {
		3081	$_->()
		3082	for values %{delete $self->{refresh_hook}};
		3083	}
2762		3084
2763	if ($self->{check_size}) {	3085	if ($self->{check_size}) {
2764	my @queue = ([], []);	3086	my @queue = ([], []);
2765		3087
2766	for (;;) {	3088	for (;;) {
…		…
2774		3096
2775	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3097	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776	? @$widget{qw(user_w user_h)}	3098	? @$widget{qw(user_w user_h)}
2777	: $widget->size_request;	3099	: $widget->size_request;
2778		3100
		3101	if (delete $widget->{force_alloc}
2779	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3102	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2780	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3103	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781		3104
2782	$widget->{req_w} = $w;	3105	$widget->{req_w} = $w;
2783	$widget->{req_h} = $h;	3106	$widget->{req_h} = $h;
2784		3107
2785	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3108	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2786		3109
2787	$widget->{parent}->check_size	3110	$widget->{parent}->check_size
2788	if $widget->{parent};	3111	if $widget->{parent};
2789	}	3112	}
2790	}	3113	}
…		…
2797	$w = 0 if $w < 0;	3120	$w = 0 if $w < 0;
2798	$h = 0 if $h < 0;	3121	$h = 0 if $h < 0;
2799		3122
2800	$widget->{w} = $w;	3123	$widget->{w} = $w;
2801	$widget->{h} = $h;	3124	$widget->{h} = $h;
2802	$widget->size_allocate ($w, $h);
2803	$widget->emit (size_allocate => $w, $h);	3125	$widget->emit (size_allocate => $w, $h);
2804	}	3126	}
2805	}	3127	}
2806		3128
2807	while ($self->{refresh_hook}) {	3129	while ($self->{post_alloc_hook}) {
2808	$_->()	3130	$_->()
2809	for values %{delete $self->{refresh_hook}};	3131	for values %{delete $self->{post_alloc_hook}};
2810	}	3132	}
2811		3133
2812	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3134	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3135	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814	glClear GL_COLOR_BUFFER_BIT;	3136	glClear GL_COLOR_BUFFER_BIT;
2815		3137
2816	glMatrixMode GL_PROJECTION;	3138	glMatrixMode GL_PROJECTION;
2817	glLoadIdentity;	3139	glLoadIdentity;
2818	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3140	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2819	glMatrixMode GL_MODELVIEW;	3141	glMatrixMode GL_MODELVIEW;
2820	glLoadIdentity;	3142	glLoadIdentity;
2821		3143
2822	$self->_draw;	3144	$self->_draw;
2823	}	3145	}
…		…
2825	#############################################################################	3147	#############################################################################
2826		3148
2827	package CFClient::UI;	3149	package CFClient::UI;
2828		3150
2829	$ROOT = new CFClient::UI::Root;	3151	$ROOT = new CFClient::UI::Root;
2830	$TOOLTIP = new CFClient::UI::Tooltip;	3152	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831		3153
2832	1	3154	1
2833		3155

Diff Legend

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