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

Diff Legend

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