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.188 by root, Mon May 8 21:16:09 2006 UTC vs.
Revision 1.232 by root, Thu May 25 02:23:14 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	}	51	}
49		52
50	# class methods for events	53	# class methods for events
51	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	56	if $FOCUS;
54	}	57	}
55		58
56	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	61	if $FOCUS;
59	}	62	}
60		63
61	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	65	my ($ev) = @_;
…		…
71	check_tooltip;	74	check_tooltip;
72	}	75	}
73		76
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		78
76	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79	}
80	}	81	}
81		82
82	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	84	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
85		86
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87		88
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		90
90	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		93
95	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	96	$grab->update if $grab;
98	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
114	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
115		114
116	check_tooltip;	115	check_tooltip;
117	}	116	}
118		117
119	if ($HOVER) {
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122	}	119	if $HOVER;
123	}	120	}
124		121
125	# convert position array to integers	122	# convert position array to integers
126	sub harmonize {	123	sub harmonize {
127	my ($vals) = @_;	124	my ($vals) = @_;
…		…
131	for (@$vals) {	128	for (@$vals) {
132	my $i = int $_ + $rem;	129	my $i = int $_ + $rem;
133	$rem += $_ - $i;	130	$rem += $_ - $i;
134	$_ = $i;	131	$_ = $i;
135	}	132	}
		133	}
		134
		135	sub full_refresh {
		136	# make a copy, otherwise for complains about freed values.
		137	my @widgets = values %WIDGET;
		138
		139	$_->update
		140	for @widgets;
		141	}
		142
		143	sub reconfigure_widgets {
		144	# make a copy, otherwise C<for> complains about freed values.
		145	my @widgets = values %WIDGET;
		146
		147	$_->reconfigure
		148	for @widgets;
		149	}
		150
		151	# call when resolution changes etc.
		152	sub rescale_widgets {
		153	my ($sx, $sy) = @_;
		154
		155	for my $widget (values %WIDGET) {
		156	if ($widget->{is_toplevel}) {
		157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		165	}
		166	}
		167
		168	reconfigure_widgets;
136	}	169	}
137		170
138	#############################################################################	171	#############################################################################
139		172
140	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
158	if (/^connect_(.*)$/) {	191	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	192	$self->connect ($1 => delete $self->{$_});
160	}	193	}
161	}	194	}
162		195
		196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		197
163	$self	198	$self
164	}	199	}
165		200
166	sub destroy {	201	sub destroy {
167	my ($self) = @_;	202	my ($self) = @_;
…		…
170	%$self = ();	205	%$self = ();
171	}	206	}
172		207
173	sub show {	208	sub show {
174	my ($self) = @_;	209	my ($self) = @_;
175
176	return if $self->{parent};	210	return if $self->{parent};
177		211
178	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
179	}	213	}
180		214
181	sub hide {	215	sub show_centered {
182	my ($self) = @_;	216	my ($self) = @_;
		217	return if $self->{parent};
		218
		219	$self->show;
		220
		221	$CFClient::UI::ROOT->on_post_alloc (
		222	"centered $self" => sub {
		223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		224	},
		225	);
		226	}
		227
		228	sub set_invisible {
		229	my ($self) = @_;
		230
		231	# broken show/hide model
		232
		233	delete $self->{visible};
183		234
184	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
185	undef $HOVER if $HOVER == $self;	236	undef $HOVER if $HOVER == $self;
		237
		238	CFClient::UI::check_tooltip
		239	if $CFClient::UI::TOOLTIP->{owner} == $self;
		240
		241	$self->focus_out;
		242	}
		243
		244	sub hide {
		245	my ($self) = @_;
		246
		247	$self->set_invisible;
186		248
187	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
188	if $self->{parent};	250	if $self->{parent};
189	}	251	}
190		252
…		…
232	$self->{y} = $y;	294	$self->{y} = $y;
233	$self->update;	295	$self->update;
234	}	296	}
235		297
236	if ($self->{w} != $w || $self->{h} != $h) {	298	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	299	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	300	}
244	}	301	}
245		302
246	sub size_allocate {	303	sub size_allocate {
247	# nothing to be done	304	# nothing to be done
248	}	305	}
249		306
		307	sub reconfigure {
		308	my ($self) = @_;
		309
		310	$self->check_size (1);
		311	$self->update;
		312	}
		313
250	sub children {	314	sub children {
251	}
252
253	# call when resolution changes etc.
254	sub reconfigure {
255	my ($self) = @_;
256
257	$_->reconfigure
258	for $self->children;
259
260	$self->check_size;
261	$self->size_allocate ($self->{w}, $self->{h});
262	$self->update;
263	}	315	}
264		316
265	sub set_max_size {	317	sub set_max_size {
266	my ($self, $w, $h) = @_;	318	my ($self, $w, $h) = @_;
267		319
268	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
269	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
270	}	322	}
271		323
272	# return top left coordinates	324	sub set_tooltip {
273	sub _topleft {
274	my ($self, $x, $y) = @_;	325	my ($self, $tooltip) = @_;
275		326
276	$self->{parent}	327	$self->{tooltip} = $tooltip;
277	or Carp::confess "no parent widget in _topleft\n";#d#
278		328
279	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	329	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		330	delete $CFClient::UI::TOOLTIP->{owner};
		331	CFClient::UI::check_tooltip;
		332	}
280	}	333	}
281		334
282	# translate global coordinates to local coordinate system	335	# translate global coordinates to local coordinate system
283	sub coord2local {	336	sub coord2local {
284	my ($self, $x, $y) = @_;	337	my ($self, $x, $y) = @_;
285		338
286	my ($X, $Y) = $self->_topleft;	339	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287	($x - $X, $y - $Y)
288	}	340	}
289		341
290	# translate local coordinates to global coordinate system	342	# translate local coordinates to global coordinate system
291	sub coord2global {	343	sub coord2global {
292	my ($self, $x, $y) = @_;	344	my ($self, $x, $y) = @_;
293		345
294	my ($X, $Y) = $self->_topleft;	346	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295	($x + $X, $y + $Y)
296	}	347	}
297		348
298	sub focus_in {	349	sub focus_in {
299	my ($self) = @_;	350	my ($self) = @_;
300		351
301	return if $FOCUS == $self;	352	return if $FOCUS == $self;
302	return unless $self->{can_focus};	353	return unless $self->{can_focus};
303		354
304	my $focus = $FOCUS; $FOCUS = $self;	355	my $focus = $FOCUS; $FOCUS = $self;
305		356
306	$self->emit (focus_in => $focus);	357	$self->_emit (focus_in => $focus);
307		358
308	$focus->update if $focus;	359	$focus->update if $focus;
309	$FOCUS->update;	360	$FOCUS->update;
310	}	361	}
311		362
…		…
314		365
315	return unless $FOCUS == $self;	366	return unless $FOCUS == $self;
316		367
317	my $focus = $FOCUS; undef $FOCUS;	368	my $focus = $FOCUS; undef $FOCUS;
318		369
319	$self->emit (focus_out => $focus);	370	$self->_emit (focus_out => $focus);
320		371
321	$focus->update if $focus; #?	372	$focus->update if $focus; #?
		373
		374	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		375	unless $FOCUS;
322	}	376	}
323		377
324	sub mouse_motion { }	378	sub mouse_motion { }
325	sub button_up { }	379	sub button_up { }
326	sub key_down { }	380	sub key_down { }
327	sub key_up { }	381	sub key_up { }
328		382
329	sub button_down {	383	sub button_down {
330	my ($self, $ev, $x, $y) = @_;	384	my ($self, $ev, $x, $y) = @_;
331		385
332	$self->focus_in;	386	$self->focus_in;
…		…
372	glVertex $self->{w}, 0;	426	glVertex $self->{w}, 0;
373	glVertex $self->{w}, $self->{h};	427	glVertex $self->{w}, $self->{h};
374	glVertex 0 , $self->{h};	428	glVertex 0 , $self->{h};
375	glEnd;	429	glEnd;
376	glPopMatrix;	430	glPopMatrix;
377	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	431	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378	}	432	}
379	}	433	}
380		434
381	sub _draw {	435	sub _draw {
382	my ($self) = @_;	436	my ($self) = @_;
…		…
398		452
399	sub set_parent {	453	sub set_parent {
400	my ($self, $parent) = @_;	454	my ($self, $parent) = @_;
401		455
402	Scalar::Util::weaken ($self->{parent} = $parent);	456	Scalar::Util::weaken ($self->{parent} = $parent);
		457
		458	# TODO: req_w _does_change after ->reconfigure
		459	$self->check_size
		460	unless exists $self->{req_w};
		461
		462	$self->show;
403	}	463	}
404		464
405	sub check_size {	465	sub check_size {
406	my ($self) = @_;	466	my ($self, $forced) = @_;
407		467
408	$self->{parent}	468	$self->{force_alloc} = 1 if $forced;
409	or return 1;	469	$CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411	my ($w, $h) = $self->{user_w} && $self->{user_h}
412	? @$self{qw(user_w user_h)}
413	: $self->size_request;
414
415	if ($w != $self->{req_w} || $h != $self->{req_h}) {
416	$self->{req_w} = $w;
417	$self->{req_h} = $h;
418
419	$self->{parent}->check_size
420	or $self->size_allocate (
421	(List::Util::max $self->{w}, $w),
422	(List::Util::max $self->{h}, $h),
423	);
424
425	1
426	} else {
427	0
428	}
429	}	470	}
430		471
431	sub update {	472	sub update {
432	my ($self) = @_;	473	my ($self) = @_;
433		474
…		…
439	my ($self, $signal, $cb) = @_;	480	my ($self, $signal, $cb) = @_;
440		481
441	push @{ $self->{signal_cb}{$signal} }, $cb;	482	push @{ $self->{signal_cb}{$signal} }, $cb;
442	}	483	}
443		484
		485	sub _emit {
		486	my ($self, $signal, @args) = @_;
		487
		488	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		489	}
		490
444	sub emit {	491	sub emit {
445	my ($self, $signal, @args) = @_;	492	my ($self, $signal, @args) = @_;
446		493
447	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	494	$self->_emit ($signal, @args)
		495	|| $self->$signal (@args);
448	}	496	}
449		497
450	sub DESTROY {	498	sub DESTROY {
451	my ($self) = @_;	499	my ($self) = @_;
452		500
		501	delete $WIDGET{$self+0};
453	#$self->deactivate;	502	#$self->deactivate;
454	}	503	}
455		504
456	#############################################################################	505	#############################################################################
457		506
…		…
466	my $class = shift;	515	my $class = shift;
467		516
468	# range [value, low, high, page]	517	# range [value, low, high, page]
469		518
470	$class->SUPER::new (	519	$class->SUPER::new (
471	bg => [0, 0, 0, 0.2],	520	#bg => [0, 0, 0, 0.2],
472	active_bg => [1, 1, 1, 0.5],	521	#active_bg => [1, 1, 1, 0.5],
473	@_	522	@_
474	)	523	)
475	}	524	}
476		525
477	sub _draw {	526	sub _draw {
478	my ($self) = @_;	527	my ($self) = @_;
479		528
		529	my $color = $FOCUS == $self && $self->{active_bg}
		530	? $self->{active_bg}
		531	: $self->{bg};
		532
		533	if ($color && (@$color < 4 || $color->[3])) {
480	my ($w, $h) = @$self{qw(w h)};	534	my ($w, $h) = @$self{qw(w h)};
481		535
482	glEnable GL_BLEND;	536	glEnable GL_BLEND;
483	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	537	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	538	glColor @$color;
485		539
486	glBegin GL_QUADS;	540	glBegin GL_QUADS;
487	glVertex 0 , 0;	541	glVertex 0 , 0;
488	glVertex 0 , $h;	542	glVertex 0 , $h;
489	glVertex $w, $h;	543	glVertex $w, $h;
490	glVertex $w, 0;	544	glVertex $w, 0;
491	glEnd;	545	glEnd;
492		546
493	glDisable GL_BLEND;	547	glDisable GL_BLEND;
		548	}
494	}	549	}
495		550
496	#############################################################################	551	#############################################################################
497		552
498	package CFClient::UI::Empty;	553	package CFClient::UI::Empty;
…		…
542	$self->{children} = [	597	$self->{children} = [
543	sort { $a->{z} <=> $b->{z} }	598	sort { $a->{z} <=> $b->{z} }
544	@{$self->{children}}, @widgets	599	@{$self->{children}}, @widgets
545	];	600	];
546		601
547	$_->check_size	602	$self->check_size (1);
548	for @widgets;
549
550	$self->update;	603	$self->update;
551	}	604	}
552		605
553	sub children {	606	sub children {
554	@{ $_[0]{children} }	607	@{ $_[0]{children} }
…		…
661	}	714	}
662		715
663	sub update {	716	sub update {
664	my ($self) = @_;	717	my ($self) = @_;
665		718
666	$ROOT->on_refresh ($self => sub { $self->render_child });	719	$ROOT->on_post_alloc ($self => sub { $self->render_child });
667	$self->SUPER::update;	720	$self->SUPER::update;
668	}	721	}
669		722
670	sub size_allocate {	723	sub size_allocate {
671	my ($self, $w, $h) = @_;	724	my ($self, $w, $h) = @_;
…		…
684	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	737	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
685	glClearColor 0, 0, 0, 0;	738	glClearColor 0, 0, 0, 0;
686	glClear GL_COLOR_BUFFER_BIT;	739	glClear GL_COLOR_BUFFER_BIT;
687		740
688	$self->_render;	741	$self->_render;
689	# glColorMask 1, 1, 1, 0;
690	# glEnable GL_BLEND;
691	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692	# glRasterPos 0, 0;
693	# glCopyPixels 0, 0, $self->{w}, $self->{h};
694	# glDisable GL_BLEND;
695	# glColorMask 1, 1, 1, 1;
696	};	742	};
697	}	743	}
698		744
699	sub _draw {	745	sub _draw {
700	my ($self) = @_;	746	my ($self) = @_;
…		…
702	my ($w, $h) = ($self->w, $self->h);	748	my ($w, $h) = ($self->w, $self->h);
703		749
704	my $tex = $self->{texture}	750	my $tex = $self->{texture}
705	or return;	751	or return;
706		752
707	glEnable GL_BLEND;
708	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
709	glEnable GL_TEXTURE_2D;	753	glEnable GL_TEXTURE_2D;
710	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	754	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711	glColor 0, 0, 0, 1;	755	glColor 1, 1, 1, 1;
712		756
713	$tex->draw_quad (0, 0, $w, $h);	757	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
714		758
715	glDisable GL_BLEND;
716	glDisable GL_TEXTURE_2D;	759	glDisable GL_TEXTURE_2D;
717	}	760	}
718		761
719	#############################################################################	762	#############################################################################
720		763
…		…
724		767
725	sub size_request {	768	sub size_request {
726	my ($self) = @_;	769	my ($self) = @_;
727		770
728	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	771	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
729	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
730		772
731	@$self{qw(child_w child_h)}	773	@$self{qw(child_w child_h)}
732	}	774	}
733		775
734	sub size_allocate {	776	sub size_allocate {
735	my ($self, $w, $h) = @_;	777	my ($self, $w, $h) = @_;
736		778
		779	my ($cw, $ch) = @$self{qw(child_w child_h)};
		780	# $w = $self->{w};
		781	$self->child->configure (0, 0, $cw, $ch);
737	$self->update;	782	$self->update;
738	}	783	}
739		784
740	sub set_offset {	785	sub set_offset {
741	my ($self, $x, $y) = @_;	786	my ($self, $x, $y) = @_;
…		…
744	$self->{view_y} = int $y;	789	$self->{view_y} = int $y;
745		790
746	$self->update;	791	$self->update;
747	}	792	}
748		793
749	# hmm, this does not work for topleft of $self... but we should not aks for that	794	# hmm, this does not work for topleft of $self... but we should not ask for that
750	sub _topleft {	795	sub coord2local {
751	my ($self, $x, $y) = @_;	796	my ($self, $x, $y) = @_;
752		797
753	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	798	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		799	}
		800
		801	sub coord2global {
		802	my ($self, $x, $y) = @_;
		803
		804	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		805	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		806
		807	$self->SUPER::coord2global ($x, $y)
754	}	808	}
755		809
756	sub find_widget {	810	sub find_widget {
757	my ($self, $x, $y) = @_;	811	my ($self, $x, $y) = @_;
758		812
…		…
786		840
787	my $slider = new CFClient::UI::Slider	841	my $slider = new CFClient::UI::Slider
788	vertical => 1,	842	vertical => 1,
789	range => [0, 0, 1, 0.01], # HACK fix	843	range => [0, 0, 1, 0.01], # HACK fix
790	connect_changed => sub {	844	connect_changed => sub {
791	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	845	$self->{vp}->set_offset (0, $_[1]);
792	},	846	},
793	;	847	;
794		848
795	$self = $class->SUPER::new (	849	$self = $class->SUPER::new (
796	vp => (new CFClient::UI::ViewPort),	850	vp => (new CFClient::UI::ViewPort expand => 1),
797	slider => $slider,	851	slider => $slider,
798	@_,	852	@_,
799	);	853	);
800		854
801	$self->{vp}->add ($self->{scrolled});	855	$self->{vp}->add ($self->{scrolled});
…		…
803	$self->add ($self->{slider});	857	$self->add ($self->{slider});
804		858
805	$self	859	$self
806	}	860	}
807		861
		862	sub size_allocate {
		863	my ($self, $w, $h) = @_;
		864
		865	$self->SUPER::size_allocate ($w, $h);
		866
		867	my $child = $self->{vp}->child;
		868	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		869	}
		870
808	#TODO# update range on size_allocate depeneing on child	871	#TODO# update range on size_allocate depending on child
809	# update viewport offset on scroll	872	# update viewport offset on scroll
810		873
811	#############################################################################	874	#############################################################################
812		875
813	package CFClient::UI::Frame;	876	package CFClient::UI::Frame;
…		…
817	use CFClient::OpenGL;	880	use CFClient::OpenGL;
818		881
819	sub new {	882	sub new {
820	my $class = shift;	883	my $class = shift;
821		884
822	my $self = $class->SUPER::new (	885	$class->SUPER::new (
823	bg => [1, 1, 1, 1],	886	bg => undef,
824	border_bg => [1, 1, 1, 1],
825	border => 0.8,
826	@_	887	@_,
827	);	888	)
828
829	$self
830	}	889	}
831		890
832	sub _draw {	891	sub _draw {
833	my ($self) = @_;	892	my ($self) = @_;
834		893
835	my ($w, $h) = ($self->{w}, $self->{h});	894	if ($self->{bg}) {
		895	my ($w, $h) = @$self{qw(w h)};
836		896
837	glEnable GL_BLEND;	897	glEnable GL_BLEND;
838	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	898	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839	glEnable GL_TEXTURE_2D;	899	glColor @{ $self->{bg} };
840	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
841		900
842	# glBegin GL_QUADS;	901	glBegin GL_QUADS;
843	# glColor 0, 0, 0, 0;
844	# glVertex 0 , 0;	902	glVertex 0 , 0;
845	# glVertex 0 , $h;	903	glVertex 0 , $h;
846	# glVertex $w, $h;	904	glVertex $w, $h;
847	# glVertex $w, 0;	905	glVertex $w, 0;
848	# glEnd;	906	glEnd;
849		907
850
851	$self->child->draw;
852	glDisable GL_BLEND;	908	glDisable GL_BLEND;
853	glDisable GL_TEXTURE_2D;	909	}
		910
		911	$self->SUPER::_draw;
854	}	912	}
855		913
856	#############################################################################	914	#############################################################################
857		915
858	package CFClient::UI::FancyFrame;	916	package CFClient::UI::FancyFrame;
…		…
869	my $class = shift;	927	my $class = shift;
870		928
871	# TODO: user_x, user_y, overwrite moveto?	929	# TODO: user_x, user_y, overwrite moveto?
872		930
873	my $self = $class->SUPER::new (	931	my $self = $class->SUPER::new (
874	bg => [1, 1, 1, 1],	932	bg => [1, 1, 1, 1],
875	border_bg => [1, 1, 1, 1],	933	border_bg => [1, 1, 1, 1],
876	border => 0.6,	934	border => 0.6,
		935	is_toplevel => 1,
877	can_events => 1,	936	can_events => 1,
878	@_	937	@_
879	);	938	);
880		939
881	$self->{title} &&= new CFClient::UI::Label	940	$self->{title} &&= new CFClient::UI::Label
882	align => 0,	941	align => 0,
…		…
906	my ($self, $w, $h) = @_;	965	my ($self, $w, $h) = @_;
907		966
908	$h -= List::Util::max 0, $self->border * 2;	967	$h -= List::Util::max 0, $self->border * 2;
909	$w -= List::Util::max 0, $self->border * 2;	968	$w -= List::Util::max 0, $self->border * 2;
910		969
911	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	970	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
912	if $self->{title};	971	if $self->{title};
913		972
914	$self->child->configure ($self->border, $self->border, $w, $h);	973	$self->child->configure ($self->border, $self->border, $w, $h);
915	}	974	}
916		975
…		…
974	my ($self) = @_;	1033	my ($self) = @_;
975		1034
976	my ($w, $h ) = ($self->{w}, $self->{h});	1035	my ($w, $h ) = ($self->{w}, $self->{h});
977	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1036	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
978		1037
979	glEnable GL_BLEND;
980	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
981	glEnable GL_TEXTURE_2D;	1038	glEnable GL_TEXTURE_2D;
982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1039	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983		1040
984	my $border = $self->border;	1041	my $border = $self->border;
985		1042
986	glColor @{ $self->{border_bg} };	1043	glColor @{ $self->{border_bg} };
987	$tex[1]->draw_quad (0, 0, $w, $border);	1044	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
988	$tex[3]->draw_quad (0, $border, $border, $ch);	1045	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
989	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1046	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1047	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
991		1048
992	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1049	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993	my $bg = $tex[0];	1050	my $bg = $tex[0];
994		1051
995	# TODO: repeat texture not scale	1052	# TODO: repeat texture not scale
…		…
999	glColor @{ $self->{bg} };	1056	glColor @{ $self->{bg} };
1000		1057
1001	$bg->{s} = $rep_x;	1058	$bg->{s} = $rep_x;
1002	$bg->{t} = $rep_y;	1059	$bg->{t} = $rep_y;
1003	$bg->{wrap_mode} = 1;	1060	$bg->{wrap_mode} = 1;
1004	$bg->draw_quad ($border, $border, $cw, $ch);	1061	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1062	}
1005		1063
1006	glDisable GL_TEXTURE_2D;	1064	glDisable GL_TEXTURE_2D;
1007	glDisable GL_BLEND;
1008	}
1009		1065
1010	$self->{title}->draw if $self->{title};	1066	$self->{title}->draw if $self->{title};
1011		1067
1012	$self->child->draw;	1068	$self->child->draw;
1013	}	1069	}
…		…
1240	}	1296	}
1241		1297
1242	sub size_allocate {	1298	sub size_allocate {
1243	my ($self, $w, $h) = @_;	1299	my ($self, $w, $h) = @_;
1244		1300
		1301	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1302
1245	my $children = $self->{children};	1303	my $children = $self->{children};
1246		1304
1247	my @h = map $_->{req_h}, @$children;	1305	my @h = map $_->{req_h}, @$children;
1248		1306
1249	my $req_h = List::Util::sum @h;	1307	my $req_h = List::Util::sum @h;
…		…
1278		1336
1279	#############################################################################	1337	#############################################################################
1280		1338
1281	package CFClient::UI::Label;	1339	package CFClient::UI::Label;
1282		1340
1283	our @ISA = CFClient::UI::Base::;	1341	our @ISA = CFClient::UI::DrawBG::;
1284		1342
1285	use CFClient::OpenGL;	1343	use CFClient::OpenGL;
1286		1344
1287	sub new {	1345	sub new {
1288	my ($class, %arg) = @_;	1346	my ($class, %arg) = @_;
1289		1347
1290	my $self = $class->SUPER::new (	1348	my $self = $class->SUPER::new (
1291	fg => [1, 1, 1],	1349	fg => [1, 1, 1],
		1350	#bg => none
		1351	#active_bg => none
1292	#font => default_font	1352	#font => default_font
		1353	#text => initial text
		1354	#markup => initial narkup
		1355	#max_w => maximum pixel width
		1356	ellipsise => 3, # end
		1357	layout => (new CFClient::Layout),
1293	fontsize => 1,	1358	fontsize => 1,
1294	text => "",
1295	align => -1,	1359	align => -1,
1296	valign => -1,	1360	valign => -1,
1297	padding => 2,	1361	padding => 2,
1298	layout => new CFClient::Layout,
1299	can_events => 0,	1362	can_events => 0,
1300	%arg	1363	%arg
1301	);	1364	);
1302		1365
1303	if (exists $self->{template}) {	1366	if (exists $self->{template}) {
1304	my $layout = new CFClient::Layout;	1367	my $layout = new CFClient::Layout;
1305	$layout->set_text (delete $self->{template});	1368	$layout->set_text (delete $self->{template});
1306	$self->{template} = $layout;	1369	$self->{template} = $layout;
1307	}	1370	}
1308		1371
1309	$self->set_text (delete $self->{text}) if exists $self->{text};	1372	if (exists $self->{markup}) {
1310	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1373	$self->set_markup (delete $self->{markup});
		1374	} else {
		1375	$self->set_text (delete $self->{text});
		1376	}
1311		1377
1312	$self	1378	$self
1313	}	1379	}
1314		1380
1315	sub escape {	1381	sub escape($) {
1316	local $_ = $_[1];	1382	local $_ = $_[0];
1317		1383
1318	s/&/&amp;/g;	1384	s/&/&amp;/g;
1319	s/>/&gt;/g;	1385	s/>/&gt;/g;
1320	s/</&lt;/g;	1386	s/</&lt;/g;
1321		1387
1322	$_[1]	1388	$_
1323	}	1389	}
1324		1390
1325	sub update {	1391	sub update {
1326	my ($self) = @_;	1392	my ($self) = @_;
1327		1393
…		…
1333	my ($self, $text) = @_;	1399	my ($self, $text) = @_;
1334		1400
1335	return if $self->{text} eq "T$text";	1401	return if $self->{text} eq "T$text";
1336	$self->{text} = "T$text";	1402	$self->{text} = "T$text";
1337		1403
		1404	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1338	$self->{layout}->set_text ($text);	1405	$self->{layout}->set_text ($text);
1339		1406
1340	delete $self->{texture};
1341	$self->update;	1407	$self->update;
1342	$self->check_size;	1408	$self->check_size;
1343	}	1409	}
1344		1410
1345	sub set_markup {	1411	sub set_markup {
1346	my ($self, $markup) = @_;	1412	my ($self, $markup) = @_;
1347		1413
1348	return if $self->{text} eq "M$markup";	1414	return if $self->{text} eq "M$markup";
1349	$self->{text} = "M$markup";	1415	$self->{text} = "M$markup";
1350		1416
		1417	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1418
		1419	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1351	$self->{layout}->set_markup ($markup);	1420	$self->{layout}->set_markup ($markup);
1352		1421
1353	delete $self->{texture};
1354	$self->update;	1422	$self->update;
1355	$self->check_size;	1423	$self->check_size;
1356	}	1424	}
1357		1425
1358	sub size_request {	1426	sub size_request {
1359	my ($self) = @_;	1427	my ($self) = @_;
1360		1428
1361	$self->{layout}->set_font ($self->{font}) if $self->{font};	1429	$self->{layout}->set_font ($self->{font}) if $self->{font};
1362	$self->{layout}->set_width ($self->{max_w} || -1);	1430	$self->{layout}->set_width ($self->{max_w} || -1);
		1431	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1432	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1363	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1433	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1364		1434
1365	my ($w, $h) = $self->{layout}->size;	1435	my ($w, $h) = $self->{layout}->size;
1366		1436
1367	if (exists $self->{template}) {	1437	if (exists $self->{template}) {
…		…
1397	}	1467	}
1398		1468
1399	sub _draw {	1469	sub _draw {
1400	my ($self) = @_;	1470	my ($self) = @_;
1401		1471
		1472	$self->SUPER::_draw; # draw background, if applicable
		1473
1402	my $tex = $self->{texture} ||= do {	1474	my $tex = $self->{texture} ||= do {
		1475	$self->{layout}->set_foreground (@{$self->{fg}});
1403	$self->{layout}->set_font ($self->{font}) if $self->{font};	1476	$self->{layout}->set_font ($self->{font}) if $self->{font};
1404	$self->{layout}->set_width ($self->{w});	1477	$self->{layout}->set_width ($self->{w});
		1478	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1479	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1405	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1480	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1481
1406	new_from_layout CFClient::Texture $self->{layout}	1482	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1483
		1484	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1485	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1486	: ($self->{w} - $tex->{w}) * 0.5);
		1487
		1488	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1489	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1490	: ($self->{h} - $tex->{h}) * 0.5);
		1491
		1492	$tex
1407	};	1493	};
1408		1494
1409	glEnable GL_BLEND;
1410	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411	glEnable GL_TEXTURE_2D;	1495	glEnable GL_TEXTURE_2D;
1412	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413		1497
		1498	if ($tex->{format} == GL_ALPHA) {
1414	glColor @{$self->{fg}};	1499	glColor @{$self->{fg}};
1415
1416	$self->{ox} = int (
1417	$self->{align} < 0 ? $self->{padding}
1418	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419	: ($self->{w} - $tex->{w}) * 0.5
1420	);
1421
1422	$self->{oy} = int (
1423	$self->{valign} < 0 ? $self->{padding}
1424	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425	: ($self->{h} - $tex->{h}) * 0.5
1426	);
1427
1428	$tex->draw_quad ($self->{ox}, $self->{oy});	1500	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1501	} else {
		1502	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1503	}
1429		1504
1430	glDisable GL_TEXTURE_2D;	1505	glDisable GL_TEXTURE_2D;
1431	glDisable GL_BLEND;
1432	}	1506	}
1433		1507
1434	#############################################################################	1508	#############################################################################
1435		1509
1436	package CFClient::UI::EntryBase;	1510	package CFClient::UI::EntryBase;
…		…
1449	active_fg => [0, 0, 0],	1523	active_fg => [0, 0, 0],
1450	can_hover => 1,	1524	can_hover => 1,
1451	can_focus => 1,	1525	can_focus => 1,
1452	valign => 0,	1526	valign => 0,
1453	can_events => 1,	1527	can_events => 1,
		1528	#text => ...
1454	@_	1529	@_
1455	)	1530	)
1456	}	1531	}
1457		1532
1458	sub _set_text {	1533	sub _set_text {
…		…
1468	$self->{text} = $text;	1543	$self->{text} = $text;
1469		1544
1470	$text =~ s/./*/g if $self->{hidden};	1545	$text =~ s/./*/g if $self->{hidden};
1471	$self->{layout}->set_text ("$text ");	1546	$self->{layout}->set_text ("$text ");
1472		1547
1473	$self->emit (changed => $self->{text});	1548	$self->_emit (changed => $self->{text});
1474	}
1475
1476	sub get_text {
1477	$_[0]{text}
1478	}
1479
1480	sub size_request {
1481	my ($self) = @_;
1482
1483	my ($w, $h) = $self->SUPER::size_request;
1484
1485	($w + 1, $h) # add 1 for cursor
1486	}
1487
1488	sub size_allocate {
1489	my ($self, $w, $h) = @_;
1490
1491	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492	}	1549	}
1493		1550
1494	sub set_text {	1551	sub set_text {
1495	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1496		1553
1497	$self->{cursor} = length $text;	1554	$self->{cursor} = length $text;
1498	$self->_set_text ($text);	1555	$self->_set_text ($text);
1499	$self->update;	1556	$self->update;
		1557	$self->check_size;
		1558	}
		1559
		1560	sub get_text {
		1561	$_[0]{text}
		1562	}
		1563
		1564	sub size_request {
		1565	my ($self) = @_;
		1566
		1567	my ($w, $h) = $self->SUPER::size_request;
		1568
		1569	($w + 1, $h) # add 1 for cursor
1500	}	1570	}
1501		1571
1502	sub key_down {	1572	sub key_down {
1503	my ($self, $ev) = @_;	1573	my ($self, $ev) = @_;
1504		1574
…		…
1506	my $sym = $ev->{sym};	1576	my $sym = $ev->{sym};
1507	my $uni = $ev->{unicode};	1577	my $uni = $ev->{unicode};
1508		1578
1509	my $text = $self->get_text;	1579	my $text = $self->get_text;
1510		1580
1511	if ($sym == 8) {	1581	if ($uni == 8) {
1512	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1582	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513	} elsif ($sym == 127) {	1583	} elsif ($uni == 127) {
1514	substr $text, $self->{cursor}, 1, "";	1584	substr $text, $self->{cursor}, 1, "";
1515	} elsif ($sym == CFClient::SDLK_LEFT) {	1585	} elsif ($sym == CFClient::SDLK_LEFT) {
1516	--$self->{cursor} if $self->{cursor};	1586	--$self->{cursor} if $self->{cursor};
1517	} elsif ($sym == CFClient::SDLK_RIGHT) {	1587	} elsif ($sym == CFClient::SDLK_RIGHT) {
1518	++$self->{cursor} if $self->{cursor} < length $self->{text};	1588	++$self->{cursor} if $self->{cursor} < length $self->{text};
1519	} elsif ($sym == CFClient::SDLK_HOME) {	1589	} elsif ($sym == CFClient::SDLK_HOME) {
1520	$self->{cursor} = 0;	1590	$self->{cursor} = 0;
1521	} elsif ($sym == CFClient::SDLK_END) {	1591	} elsif ($sym == CFClient::SDLK_END) {
1522	$self->{cursor} = length $text;	1592	$self->{cursor} = length $text;
1523	} elsif ($sym == 27) {	1593	} elsif ($uni == 27) {
1524	$self->emit ('escape');	1594	$self->_emit ('escape');
1525	} elsif ($uni) {	1595	} elsif ($uni) {
1526	substr $text, $self->{cursor}++, 0, chr $uni;	1596	substr $text, $self->{cursor}++, 0, chr $uni;
1527	}	1597	}
1528		1598
1529	$self->_set_text ($text);	1599	$self->_set_text ($text);
1530	$self->update;	1600	$self->update;
		1601	$self->check_size;
1531	}	1602	}
1532		1603
1533	sub focus_in {	1604	sub focus_in {
1534	my ($self) = @_;	1605	my ($self) = @_;
1535		1606
…		…
1615	if ($sym == 13) {	1686	if ($sym == 13) {
1616	unshift @{$self->{history}},	1687	unshift @{$self->{history}},
1617	my $txt = $self->get_text;	1688	my $txt = $self->get_text;
1618	$self->{history_pointer} = -1;	1689	$self->{history_pointer} = -1;
1619	$self->{history_saveback} = '';	1690	$self->{history_saveback} = '';
1620	$self->emit (activate => $txt);	1691	$self->_emit (activate => $txt);
1621	$self->update;	1692	$self->update;
1622		1693
1623	} elsif ($sym == CFClient::SDLK_UP) {	1694	} elsif ($sym == CFClient::SDLK_UP) {
1624	if ($self->{history_pointer} < 0) {	1695	if ($self->{history_pointer} < 0) {
1625	$self->{history_saveback} = $self->get_text;	1696	$self->{history_saveback} = $self->get_text;
…		…
1664	my $class = shift;	1735	my $class = shift;
1665		1736
1666	$class->SUPER::new (	1737	$class->SUPER::new (
1667	padding => 4,	1738	padding => 4,
1668	fg => [1, 1, 1],	1739	fg => [1, 1, 1],
1669	bg => [1, 1, 1, 0.2],
1670	active_fg => [0, 0, 1],	1740	active_fg => [0, 0, 1],
1671	can_hover => 1,	1741	can_hover => 1,
1672	align => 0,	1742	align => 0,
1673	valign => 0,	1743	valign => 0,
1674	can_events => 1,	1744	can_events => 1,
1675	@_	1745	@_
1676	)	1746	)
1677	}	1747	}
1678		1748
		1749	sub activate { }
		1750
1679	sub button_up {	1751	sub button_up {
1680	my ($self, $ev, $x, $y) = @_;	1752	my ($self, $ev, $x, $y) = @_;
1681		1753
		1754	$self->emit ("activate")
1682	if ($x >= 0 && $x < $self->{w}	1755	if $x >= 0 && $x < $self->{w}
1683	&& $y >= 0 && $y < $self->{h}) {	1756	&& $y >= 0 && $y < $self->{h};
1684	$self->emit ("activate");
1685	}
1686	}	1757	}
1687		1758
1688	sub _draw {	1759	sub _draw {
1689	my ($self) = @_;	1760	my ($self) = @_;
1690		1761
…		…
1692		1763
1693	if ($GRAB == $self) {	1764	if ($GRAB == $self) {
1694	$self->{fg} = $self->{active_fg};	1765	$self->{fg} = $self->{active_fg};
1695	}	1766	}
1696		1767
1697	glEnable GL_BLEND;
1698	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699	glEnable GL_TEXTURE_2D;	1768	glEnable GL_TEXTURE_2D;
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1769	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	glColor 0, 0, 0, 1;	1770	glColor 0, 0, 0, 1;
1702		1771
1703	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1772	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704		1773
1705	glDisable GL_TEXTURE_2D;	1774	glDisable GL_TEXTURE_2D;
1706	glDisable GL_BLEND;
1707		1775
1708	$self->SUPER::_draw;	1776	$self->SUPER::_draw;
1709	}	1777	}
1710		1778
1711	#############################################################################	1779	#############################################################################
…		…
1725		1793
1726	$class->SUPER::new (	1794	$class->SUPER::new (
1727	padding => 2,	1795	padding => 2,
1728	fg => [1, 1, 1],	1796	fg => [1, 1, 1],
1729	active_fg => [1, 1, 0],	1797	active_fg => [1, 1, 0],
		1798	bg => [0, 0, 0, 0.2],
		1799	active_bg => [1, 1, 1, 0.5],
1730	state => 0,	1800	state => 0,
1731	can_hover => 1,	1801	can_hover => 1,
1732	@_	1802	@_
1733	)	1803	)
1734	}	1804	}
…		…
1743	my ($self, $ev, $x, $y) = @_;	1813	my ($self, $ev, $x, $y) = @_;
1744		1814
1745	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1815	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1746	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1816	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1747	$self->{state} = !$self->{state};	1817	$self->{state} = !$self->{state};
1748	$self->emit (changed => $self->{state});	1818	$self->_emit (changed => $self->{state});
1749	}	1819	}
1750	}	1820	}
1751		1821
1752	sub _draw {	1822	sub _draw {
1753	my ($self) = @_;	1823	my ($self) = @_;
…		…
1758		1828
1759	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1829	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1760		1830
1761	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1831	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762		1832
1763	glEnable GL_BLEND;	1833	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1834
1764	glEnable GL_TEXTURE_2D;	1835	glEnable GL_TEXTURE_2D;
1765	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767	my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769	$tex->draw_quad (0, 0, $s, $s);	1836	$tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771	glDisable GL_TEXTURE_2D;	1837	glDisable GL_TEXTURE_2D;
1772	glDisable GL_BLEND;
1773	}	1838	}
1774		1839
1775	#############################################################################	1840	#############################################################################
1776		1841
1777	package CFClient::UI::Image;	1842	package CFClient::UI::Image;
…		…
1820	glTranslate 0, -$self->{w}, 0;	1885	glTranslate 0, -$self->{w}, 0;
1821		1886
1822	($w, $h) = ($h, $w);	1887	($w, $h) = ($h, $w);
1823	}	1888	}
1824		1889
1825	glEnable GL_BLEND;
1826	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827	glEnable GL_TEXTURE_2D;	1890	glEnable GL_TEXTURE_2D;
1828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1891	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829		1892
1830	$tex->draw_quad (0, 0, $w, $h);	1893	$tex->draw_quad_alpha (0, 0, $w, $h);
1831		1894
1832	glDisable GL_BLEND;
1833	glDisable GL_TEXTURE_2D;	1895	glDisable GL_TEXTURE_2D;
1834	}	1896	}
1835		1897
1836	#############################################################################	1898	#############################################################################
1837		1899
…		…
2026	qw(s1_slider.png s1_slider_bg.png);	2088	qw(s1_slider.png s1_slider_bg.png);
2027		2089
2028	sub new {	2090	sub new {
2029	my $class = shift;	2091	my $class = shift;
2030		2092
2031	# range [value, low, high, page]	2093	# range [value, low, high, page, unit]
2032		2094
2033	# TODO: 0-width page	2095	# TODO: 0-width page
2034	# TODO: req_w/h are wrong with vertical	2096	# TODO: req_w/h are wrong with vertical
2035	# TODO: calculations are off	2097	# TODO: calculations are off
2036	my $self = $class->SUPER::new (	2098	my $self = $class->SUPER::new (
2037	fg => [1, 1, 1],	2099	fg => [1, 1, 1],
2038	active_fg => [0, 0, 0],	2100	active_fg => [0, 0, 0],
		2101	bg => [0, 0, 0, 0.2],
		2102	active_bg => [1, 1, 1, 0.5],
2039	range => [0, 0, 100, 10],	2103	range => [0, 0, 100, 10, 0],
2040	req_w => $::WIDTH / 80,	2104	req_w => $::WIDTH / 80,
2041	req_h => $::WIDTH / 80,	2105	req_h => $::WIDTH / 80,
2042	vertical => 0,	2106	vertical => 0,
2043	can_hover => 1,	2107	can_hover => 1,
2044	inner_pad => 5,	2108	inner_pad => 0.02,
2045	@_	2109	@_
2046	);	2110	);
2047		2111
		2112	$self->set_value ($self->{range}[0]);
		2113	$self->update;
		2114
2048	$self	2115	$self
		2116	}
		2117
		2118	sub set_range {
		2119	my ($self, $range) = @_;
		2120
		2121	$self->{range} = $range;
		2122
		2123	$self->update;
		2124	}
		2125
		2126	sub set_value {
		2127	my ($self, $value) = @_;
		2128
		2129	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2130
		2131	$hi = $lo + 1 if $hi <= $lo;
		2132
		2133	$page = $hi - $lo if $page > $hi - $lo;
		2134
		2135	$value = $lo if $value < $lo;
		2136	$value = $hi - $page if $value > $hi - $page;
		2137
		2138	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2139	if $unit;
		2140
		2141	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2142
		2143	if ($value != $old_value) {
		2144	$self->_emit (changed => $value);
		2145	$self->update;
		2146	}
2049	}	2147	}
2050		2148
2051	sub size_request {	2149	sub size_request {
2052	my ($self) = @_;	2150	my ($self) = @_;
2053		2151
…		…
2059		2157
2060	sub button_down {	2158	sub button_down {
2061	my ($self, $ev, $x, $y) = @_;	2159	my ($self, $ev, $x, $y) = @_;
2062		2160
2063	$self->SUPER::button_down ($ev, $x, $y);	2161	$self->SUPER::button_down ($ev, $x, $y);
		2162
		2163	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2164
2064	$self->mouse_motion ($ev, $x, $y);	2165	$self->mouse_motion ($ev, $x, $y);
2065	}	2166	}
2066		2167
2067	sub mouse_motion {	2168	sub mouse_motion {
2068	my ($self, $ev, $x, $y) = @_;	2169	my ($self, $ev, $x, $y) = @_;
2069		2170
2070	if ($GRAB == $self) {	2171	if ($GRAB == $self) {
		2172	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2173
		2174	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2175
		2176	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2177
		2178	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2179	}
		2180	}
		2181
		2182	sub update {
		2183	my ($self) = @_;
		2184
		2185	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2186	$self->set_value ($self->{range}[0]);
		2187
2071	my ($value, $lo, $hi, $page) = @{$self->{range}};	2188	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2189	my $range = ($hi - $page - $lo) || 1e-100;
2072		2190
2073	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2191	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074		2192
2075	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2193	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2194	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077		2195
2078	$x -= $inner_pad_px; # substract the padding	2196	$value = ($value - $lo) / $range;
2079	$x = $x * ($hi - $lo) / $inner_w + $lo;	2197	$value = $value * $self->{scale} + $self->{offset};
2080	$x = $lo if $x < $lo;
2081	$x = $hi - $page if $x > $hi - $page;
2082	$self->{range}[0] = $x;
2083		2198
2084	$self->emit (changed => $x);	2199	$self->{knob_x} = $value - $knob_w * 0.5;
2085	$self->update;	2200	$self->{knob_w} = $knob_w;
2086	}	2201	});
2087	}
2088		2202
2089	# the inner_* stuff is for generating a padding for the slider handle,	2203	$self->SUPER::update;
2090	# so that the handle doesn't leave the texture. This calculation isn't 100%
2091	# correct propably, but it does the job for now
2092	sub _calc_inner_pad_px {
2093	my ($self, $w) = @_;
2094	($w / 100) * $self->{inner_pad} # % to pixels
2095	}	2204	}
2096		2205
2097	sub _draw {	2206	sub _draw {
2098	my ($self) = @_;	2207	my ($self) = @_;
2099		2208
2100	$self->SUPER::_draw ();	2209	$self->SUPER::_draw ();
2101		2210
2102	my ($w, $h) = @$self{qw(w h)};	2211	glScale $self->{w}, $self->{h};
2103		2212
2104	if ($self->{vertical}) {	2213	if ($self->{vertical}) {
2105	# draw a vertical slider like a rotated horizontal slider	2214	# draw a vertical slider like a rotated horizontal slider
2106		2215
		2216	glTranslate 1, 0, 0;
2107	glRotate 90, 0, 0, 1;	2217	glRotate 90, 0, 0, 1;
2108	glTranslate 0, -$self->{w}, 0;
2109
2110	($w, $h) = ($h, $w);
2111	}	2218	}
2112		2219
2113	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2220	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2221	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115		2222
2116	my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118	$hi = $value + 1 if $lo == $hi;
2119
2120	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123	$page = int $page * $inner_w / ($hi - $lo);
2124	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126	$w -= $page;
2127	$page &= ~1;
2128	glTranslate $page * 0.5, 0, 0;
2129	$page ||= 2;
2130
2131	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134	glEnable GL_BLEND;
2135	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136	glEnable GL_TEXTURE_2D;	2223	glEnable GL_TEXTURE_2D;
2137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138		2225
2139	# draw background	2226	# draw background
2140	$tex[1]->draw_quad (0, 0, $w, $h);	2227	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141		2228
2142	# draw handle	2229	# draw handle
2143	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2230	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144		2231
2145	glDisable GL_BLEND;
2146	glDisable GL_TEXTURE_2D;	2232	glDisable GL_TEXTURE_2D;
2147	}	2233	}
		2234
		2235	#############################################################################
		2236
		2237	package CFClient::UI::ValSlider;
		2238
		2239	our @ISA = CFClient::UI::HBox::;
		2240
		2241	sub new {
		2242	my ($class, %arg) = @_;
		2243
		2244	my $range = delete $arg{range};
		2245
		2246	my $self = $class->SUPER::new (
		2247	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2248	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2249	to_value => sub { shift },
		2250	from_value => sub { shift },
		2251	%arg,
		2252	);
		2253
		2254	$self->{slider}->connect (changed => sub {
		2255	my ($self, $value) = @_;
		2256	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2257	$self->{parent}->emit (changed => $value);
		2258	});
		2259
		2260	# $self->{entry}->connect (changed => sub {
		2261	# my ($self, $value) = @_;
		2262	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2263	# $self->{parent}->emit (changed => $value);
		2264	# });
		2265
		2266	$self->add ($self->{slider}, $self->{entry});
		2267
		2268	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2269
		2270	$self
		2271	}
		2272
		2273	sub set_range { shift->{slider}->set_range (@_) }
		2274	sub set_value { shift->{slider}->set_value (@_) }
2148		2275
2149	#############################################################################	2276	#############################################################################
2150		2277
2151	package CFClient::UI::TextView;	2278	package CFClient::UI::TextView;
2152		2279
…		…
2161	fontsize => 1,	2288	fontsize => 1,
2162	can_events => 0,	2289	can_events => 0,
2163	#font => default_font	2290	#font => default_font
2164	@_,	2291	@_,
2165		2292
2166	layout => (new CFClient::Layout),	2293	layout => (new CFClient::Layout 1),
2167	par => [],	2294	par => [],
2168	height => 0,	2295	height => 0,
2169	children => [	2296	children => [
2170	(new CFClient::UI::Empty expand => 1),	2297	(new CFClient::UI::Empty expand => 1),
2171	(new CFClient::UI::Slider vertical => 1),	2298	(new CFClient::UI::Slider vertical => 1),
…		…
2182		2309
2183	$self->{fontsize} = $fontsize;	2310	$self->{fontsize} = $fontsize;
2184	$self->reflow;	2311	$self->reflow;
2185	}	2312	}
2186		2313
2187	sub text_height {
2188	my ($self, $text) = @_;
2189
2190	my $layout = $self->{layout};
2191
2192	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193	$layout->set_width ($self->{children}[0]{w});
2194	$layout->set_text ($text);
2195
2196	($layout->size)[1]
2197	}
2198
2199	sub reflow {
2200	my ($self) = @_;
2201
2202	$self->{need_reflow}++;
2203	$self->update;
2204	}
2205
2206	sub size_allocate {	2314	sub size_allocate {
2207	my ($self, $w, $h) = @_;	2315	my ($self, $w, $h) = @_;
2208		2316
2209	$self->SUPER::size_allocate ($w, $h);	2317	$self->SUPER::size_allocate ($w, $h);
2210		2318
…		…
2213	$self->{layout}->set_width ($self->{children}[0]{w});	2321	$self->{layout}->set_width ($self->{children}[0]{w});
2214		2322
2215	$self->reflow;	2323	$self->reflow;
2216	}	2324	}
2217		2325
		2326	sub text_size {
		2327	my ($self, $text, $indent) = @_;
		2328
		2329	my $layout = $self->{layout};
		2330
		2331	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2332	$layout->set_width ($self->{children}[0]{w} - $indent);
		2333	$layout->set_markup ($text);
		2334
		2335	$layout->size
		2336	}
		2337
		2338	sub reflow {
		2339	my ($self) = @_;
		2340
		2341	$self->{need_reflow}++;
		2342	$self->update;
		2343	}
		2344
		2345	sub set_offset {
		2346	my ($self, $offset) = @_;
		2347
		2348	# todo: base offset on lines or so, not on pixels
		2349	$self->{children}[1]->set_value ($offset);
		2350	}
		2351
		2352	sub clear {
		2353	my ($self) = @_;
		2354
		2355	$self->{par} = [];
		2356	$self->{height} = 0;
		2357	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2358	}
		2359
2218	sub add_paragraph {	2360	sub add_paragraph {
2219	my ($self, $color, $text) = @_;	2361	my ($self, $color, $text, $indent) = @_;
2220		2362
2221	#TODO: intelligently "reformat" paragraph	2363	for my $line (split /\n/, $text) {
2222		2364	my ($w, $h) = $self->text_size ($line);
2223	my $height = $self->text_height ($text);
2224
2225	$self->{height} += $height;	2365	$self->{height} += $h;
		2366	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2367	}
2226		2368
2227	push @{$self->{par}}, [$height, $color, $text];
2228
2229	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2369	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2230	$self->{children}[1]->update;
2231	}	2370	}
2232		2371
2233	sub update {	2372	sub update {
2234	my ($self) = @_;	2373	my ($self) = @_;
2235		2374
…		…
2237		2376
2238	return unless $self->{h} > 0;	2377	return unless $self->{h} > 0;
2239		2378
2240	delete $self->{texture};	2379	delete $self->{texture};
2241		2380
2242	$ROOT->on_refresh ($self, sub {	2381	$ROOT->on_post_alloc ($self, sub {
		2382	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2383
2243	if (delete $self->{need_reflow}) {	2384	if (delete $self->{need_reflow}) {
2244	my $height = 0;	2385	my $height = 0;
2245		2386
2246	$height += $_->[0] = $self->text_height ($_->[2])	2387	my $layout = $self->{layout};
		2388
		2389	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2390
2247	for @{$self->{par}};	2391	for (@{$self->{par}}) {
		2392	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2393	$layout->set_width ($W - $_->[3]);
		2394	$layout->set_markup ($_->[4]);
		2395	my ($w, $h) = $layout->size;
		2396	$_->[0] = $w + $_->[3];
		2397	$_->[1] = $h;
		2398	}
		2399
		2400	$height += $_->[1];
		2401	}
2248		2402
2249	$self->{height} = $height;	2403	$self->{height} = $height;
2250		2404
2251	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2405	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252		2406
2253	delete $self->{texture};	2407	delete $self->{texture};
2254	}	2408	}
2255		2409
2256	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2410	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2257	glClearColor 0, 0, 0, 0;	2411	glClearColor 0.5, 0.5, 0.5, 0;
2258	glClear GL_COLOR_BUFFER_BIT;	2412	glClear GL_COLOR_BUFFER_BIT;
2259		2413
		2414	my $top = int $self->{children}[1]{range}[0];
		2415
		2416	my $y0 = $top;
		2417	my $y1 = $top + $H;
		2418
		2419	my $y = 0;
		2420
		2421	my $layout = $self->{layout};
		2422
		2423	$layout->set_font ($self->{font}) if $self->{font};
		2424
2260	glEnable GL_BLEND;	2425	glEnable GL_BLEND;
		2426	#TODO# not correct in windows where rgba is forced off
2261	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2427	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2262	glEnable GL_TEXTURE_2D;
2263	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265	my $top = int $self->{children}[1]{range}[0];
2266
2267	my $y0 = $top;
2268	my $y1 = $top + $self->{h};
2269
2270	my $y = 0;
2271
2272	my $layout = $self->{layout};
2273
2274	$layout->set_font ($self->{font}) if $self->{font};
2275		2428
2276	for my $par (@{$self->{par}}) {	2429	for my $par (@{$self->{par}}) {
2277	my $h = $par->[0];	2430	my $h = $par->[1];
2278		2431
2279	if ($y0 < $y + $h && $y < $y1) {	2432	if ($y0 < $y + $h && $y < $y1) {
		2433	$layout->set_foreground (@{ $par->[2] });
		2434	$layout->set_width ($W - $par->[3]);
2280	$layout->set_text ($par->[2]);	2435	$layout->set_markup ($par->[4]);
2281		2436
2282	glColor @{ $par->[1] };	2437	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283	my ($W, $H) = $layout->size;	2438
2284	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2439	glRasterPos $par->[3], $y - $y0;
		2440	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2285	}	2441	}
2286		2442
2287	$y += $h;	2443	$y += $h;
2288	}	2444	}
2289		2445
2290	glDisable GL_TEXTURE_2D;
2291	glDisable GL_BLEND;	2446	glDisable GL_BLEND;
2292	};	2447	};
2293	});	2448	});
2294	}	2449	}
2295		2450
2296	sub _draw {	2451	sub _draw {
2297	my ($self) = @_;	2452	my ($self) = @_;
2298		2453
2299	glEnable GL_BLEND;
2300	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301	glEnable GL_TEXTURE_2D;	2454	glEnable GL_TEXTURE_2D;
2302	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2455	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303	glColor 1, 1, 1, 1;	2456	glColor 1, 1, 1, 1;
2304	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2457	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305	glDisable GL_TEXTURE_2D;	2458	glDisable GL_TEXTURE_2D;
2306	glDisable GL_BLEND;
2307		2459
2308	$self->{children}[1]->draw;	2460	$self->{children}[1]->draw;
2309		2461
2310	}	2462	}
2311		2463
…		…
2379		2531
2380	# TODO: use animation	2532	# TODO: use animation
2381	if ($self->{state} = !$self->{state}) {	2533	if ($self->{state} = !$self->{state}) {
2382	$CFClient::UI::ROOT->add ($self->{other});	2534	$CFClient::UI::ROOT->add ($self->{other});
2383	$self->{other}->move ($self->coord2global (0, $self->{h}));	2535	$self->{other}->move ($self->coord2global (0, $self->{h}));
2384	$self->emit ("open");	2536	$self->_emit ("open");
2385	} else {	2537	} else {
2386	$CFClient::UI::ROOT->remove ($self->{other});	2538	$CFClient::UI::ROOT->remove ($self->{other});
2387	$self->emit ("close");	2539	$self->_emit ("close");
2388	}	2540	}
2389		2541
2390	$self->emit (changed => $self->{state});	2542	$self->_emit (changed => $self->{state});
2391	}	2543	}
2392		2544
2393	#############################################################################	2545	#############################################################################
2394		2546
2395	package CFClient::UI::Tooltip;	2547	package CFClient::UI::Tooltip;
…		…
2405	@_,	2557	@_,
2406	can_events => 0,	2558	can_events => 0,
2407	)	2559	)
2408	}	2560	}
2409		2561
2410	sub set_markup {	2562	sub set_tooltip_from {
2411	my ($self, $text) = @_;	2563	my ($self, $widget) = @_;
2412		2564
2413	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2565	$self->add (new CFClient::UI::Label
2414	$self->{label}->set_markup ($text);	2566	markup => $widget->{tooltip},
2415	$self->add ($self->{label});	2567	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2568	fontsize => 0.8,
		2569	fg => [0, 0, 0, 1],
		2570	ellipsise => 0,
		2571	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2572	);
2416	}	2573	}
2417		2574
2418	sub size_request {	2575	sub size_request {
2419	my ($self) = @_;	2576	my ($self) = @_;
2420
2421	$self->child->set_max_size ($::WIDTH * 0.3);
2422		2577
2423	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2578	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424		2579
2425	($w + 4, $h + 4)	2580	($w + 4, $h + 4)
2426	}	2581	}
…		…
2432	}	2587	}
2433		2588
2434	sub _draw {	2589	sub _draw {
2435	my ($self) = @_;	2590	my ($self) = @_;
2436		2591
2437	glPushMatrix;
2438	glTranslate 0.375, 0.375;	2592	glTranslate 0.375, 0.375;
2439		2593
2440	my ($w, $h) = @$self{qw(w h)};	2594	my ($w, $h) = @$self{qw(w h)};
2441		2595
2442	glColor 1, 0.8, 0.4;	2596	glColor 1, 0.8, 0.4;
…		…
2453	glVertex 0 , $h;	2607	glVertex 0 , $h;
2454	glVertex $w, $h;	2608	glVertex $w, $h;
2455	glVertex $w, 0;	2609	glVertex $w, 0;
2456	glEnd;	2610	glEnd;
2457		2611
2458	glPopMatrix;	2612	glTranslate 2 - 0.375, 2 - 0.375;
2459
2460	glTranslate 2, 2;
2461	$self->SUPER::_draw;	2613	$self->SUPER::_draw;
2462	}	2614	}
2463		2615
2464	#############################################################################	2616	#############################################################################
2465		2617
…		…
2470	use CFClient::OpenGL;	2622	use CFClient::OpenGL;
2471		2623
2472	sub new {	2624	sub new {
2473	my $class = shift;	2625	my $class = shift;
2474		2626
2475	$class->SUPER::new (	2627	my $self = $class->SUPER::new (
2476	aspect => 1,	2628	aspect => 1,
2477	@_,	2629	@_,
2478	)	2630	);
		2631
		2632	if ($self->{anim} && $self->{animspeed}) {
		2633	Scalar::Util::weaken (my $widget = $self);
		2634
		2635	$self->{timer} = Event->timer (
		2636	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2637	hard => 1,
		2638	interval => $self->{animspeed},
		2639	cb => sub {
		2640	++$widget->{frame};
		2641	$widget->update;
		2642	},
		2643	);
		2644	}
		2645
		2646	$self
2479	}	2647	}
2480		2648
2481	sub size_request {	2649	sub size_request {
2482	(32, 8)	2650	(32, 8)
2483	}	2651	}
2484		2652
		2653	sub update {
		2654	my ($self) = @_;
		2655
		2656	return unless $self->{visible};
		2657
		2658	$self->SUPER::update;
		2659	}
		2660
2485	sub _draw {	2661	sub _draw {
2486	my ($self) = @_;	2662	my ($self) = @_;
2487		2663
2488	return unless $::CONN;#d# manage and cache textures differently	2664	return unless $::CONN;
		2665
		2666	my $face;
		2667
		2668	if ($self->{frame}) {
		2669	my $anim = $::CONN->{anim}[$self->{anim}];
		2670
		2671	$face = $anim->[ $self->{frame} % @$anim ]
		2672	if $anim && @$anim;
		2673	}
		2674
2489	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2675	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2490		2676
2491	# TODO animation
2492	if ($tex) {	2677	if ($tex) {
2493	glEnable GL_BLEND;
2494	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495	glEnable GL_TEXTURE_2D;	2678	glEnable GL_TEXTURE_2D;
2496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2679	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497	glColor 1, 1, 1, 1;	2680	glColor 1, 1, 1, 1;
2498	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2681	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499	glDisable GL_TEXTURE_2D;	2682	glDisable GL_TEXTURE_2D;
2500	glDisable GL_BLEND;
2501	}	2683	}
		2684	}
		2685
		2686	sub DESTROY {
		2687	my ($self) = @_;
		2688
		2689	$self->{timer}->cancel
		2690	if $self->{timer};
		2691
		2692	$self->SUPER::DESTROY;
2502	}	2693	}
2503		2694
2504	#############################################################################	2695	#############################################################################
2505		2696
2506	package CFClient::UI::InventoryItem;	2697	package CFClient::UI::InventoryItem;
2507		2698
2508	our @ISA = CFClient::UI::HBox::;	2699	our @ISA = CFClient::UI::HBox::;
		2700
		2701	sub _item_to_desc {
		2702	my ($item) = @_;
		2703
		2704	my $desc =
		2705	$item->{nrof} < 2
		2706	? $item->{name}
		2707	: "$item->{nrof} × $item->{name_pl}";
		2708
		2709	$item->{flags} & Crossfire::Protocol::F_OPEN
		2710	and $desc .= " (open)";
		2711	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2712	and $desc .= " (applied)";
		2713	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2714	and $desc .= " (unpaid)";
		2715	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2716	and $desc .= " (magic)";
		2717	$item->{flags} & Crossfire::Protocol::F_CURSED
		2718	and $desc .= " (cursed)";
		2719	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2720	and $desc .= " (damned)";
		2721	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2722	and $desc .= " *";
		2723
		2724	$desc
		2725	}
2509		2726
2510	sub new {	2727	sub new {
2511	my $class = shift;	2728	my $class = shift;
2512		2729
2513	my %args = @_;	2730	my %args = @_;
2514		2731
2515	my $item = $args{item};	2732	my $item = delete $args{item};
2516		2733
2517	my $desc = $item->{nrof} < 2	2734	my $desc = _item_to_desc ($item);
2518	? $item->{name}
2519	: "$item->{nrof} $item->{name_pl}";
2520
2521		2735
2522	my $self = $class->SUPER::new (	2736	my $self = $class->SUPER::new (
2523	can_hover => 1,	2737	can_hover => 1,
2524	can_events => 1,	2738	can_events => 1,
2525	tooltip => (CFClient::UI::Label->escape ($desc)	2739	tooltip => ((CFClient::UI::Label::escape $desc)
2526	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2740	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2527	connect_button_down => sub {	2741	connect_button_down => sub {
2528	my ($self, $ev, $x, $y) = @_;	2742	my ($self, $ev, $x, $y) = @_;
2529		2743
2530	# todo: maybe put examine on 1? but should just be a tooltip :(	2744	# todo: maybe put examine on 1? but should just be a tooltip :(
		2745	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2746	my $targ = $::CONN->{player}{tag};
		2747
		2748	if ($item->{container} == $::CONN->{player}{tag}) {
		2749	$targ = $main::OPENCONT;
		2750	}
		2751
		2752	$::CONN->send ("move $targ $item->{tag} 0");
2531	if ($ev->{button} == 1) {	2753	} elsif ($ev->{button} == 1) {
2532	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2754	$::CONN->send ("examine $item->{tag}");
2533	} elsif ($ev->{button} == 2) {	2755	} elsif ($ev->{button} == 2) {
2534	$::CONN->send ("apply $item->{tag}");	2756	$::CONN->send ("apply $item->{tag}");
2535	} elsif ($ev->{button} == 3) {	2757	} elsif ($ev->{button} == 3) {
2536	CFClient::UI::Menu->new (	2758	my @menu_items = (
2537	items => [
2538	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2759	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539	[
2540	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541	sub { $::CONN->send ("lock $item->{tag}") },
2542	],
2543	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2760	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2544	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2761	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2762	(
		2763	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2764	? (
		2765	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2766	)
		2767	: (
		2768	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2545	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2769	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2770	)
2546	],	2771	),
2547	)->popup ($ev);	2772	);
		2773
		2774	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2548	}	2775	}
2549		2776
2550	1	2777	1
2551	},	2778	},
2552	%args	2779	%args
2553	);	2780	);
		2781
		2782
2554	$self->add(new CFClient::UI::Face	2783	$self->add (new CFClient::UI::Face
2555	can_events => 0,	2784	can_events => 0,
2556	face => $item->{face},	2785	face => $item->{face},
2557	anim => $item->{anim},	2786	anim => $item->{anim},
2558	animspeed => $item->{animspeed});	2787	animspeed => $item->{animspeed},
2559	$self->add(new CFClient::UI::Label	2788	);
2560	can_events => 0,	2789
2561	text => $desc);	2790	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2791
		2792	$self->{item} = $item;
		2793
		2794	$self->update_item;
2562		2795
2563	$self	2796	$self
		2797	}
		2798
		2799	sub update_item {
		2800	my ($self) = @_;
		2801
		2802	my $desc = _item_to_desc ($self->{item});
		2803
		2804	$self->{name_lbl}->set_text ($desc);
2564	}	2805	}
2565		2806
2566	#############################################################################	2807	#############################################################################
2567		2808
2568	package CFClient::UI::Inventory;	2809	package CFClient::UI::Inventory;
…		…
2571		2812
2572	sub new {	2813	sub new {
2573	my $class = shift;	2814	my $class = shift;
2574		2815
2575	my $self = $class->SUPER::new (	2816	my $self = $class->SUPER::new (
2576	scrolled => (new CFClient::UI::VBox),	2817	scrolled => (new CFClient::UI::Table),
2577	@_,	2818	@_,
2578	);	2819	);
2579		2820
2580	$self	2821	$self
2581	}	2822	}
…		…
2584	my ($self, $items) = @_;	2825	my ($self, $items) = @_;
2585		2826
2586	$self->{scrolled}->clear;	2827	$self->{scrolled}->clear;
2587	return unless $items;	2828	return unless $items;
2588		2829
2589	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2830	my @items = sort {
		2831	($a->{type} <=> $b->{type})
		2832	or ($a->{name} cmp $b->{name})
		2833	} @$items;
2590		2834
2591	$self->{real_items} = \@items;	2835	$self->{real_items} = \@items;
2592		2836
2593	for my $item (@items) {	2837	for my $item (@items) {
2594	my $desc = $item->{nrof} < 2	2838	$item->{item} = $item;
2595	? $item->{name}
2596	: "$item->{nrof} $item->{name_pl}";
2597
2598	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2839	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2840	$item->update_item ();
		2841	}
		2842
		2843	my $i = 0;
		2844	for (@items) {
		2845	$self->{scrolled}->add (0, $i, $_);
		2846	my $nrof = $_->{item}->{nrof} || 1;
		2847	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2599	}	2848	}
2600		2849
2601	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2850	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2602	}	2851	}
2603		2852
…		…
2646		2895
2647	# popup given the event (must be a mouse button down event currently)	2896	# popup given the event (must be a mouse button down event currently)
2648	sub popup {	2897	sub popup {
2649	my ($self, $ev) = @_;	2898	my ($self, $ev) = @_;
2650		2899
2651	$self->emit ("popdown");	2900	$self->_emit ("popdown");
2652		2901
2653	# maybe save $GRAB? must be careful about events...	2902	# maybe save $GRAB? must be careful about events...
2654	$GRAB = $self;	2903	$GRAB = $self;
2655	$self->{button} = $ev->{button};	2904	$self->{button} = $ev->{button};
2656		2905
…		…
2671		2920
2672	if ($ev->{button} == $self->{button}) {	2921	if ($ev->{button} == $self->{button}) {
2673	undef $GRAB;	2922	undef $GRAB;
2674	$self->hide;	2923	$self->hide;
2675		2924
2676	$self->emit ("popdown");	2925	$self->_emit ("popdown");
2677	$self->{hover}[1]->() if $self->{hover};	2926	$self->{hover}[1]->() if $self->{hover};
2678	}	2927	}
2679	}	2928	}
2680		2929
2681	#############################################################################	2930	#############################################################################
2682		2931
		2932	package CFClient::UI::Statusbox;
		2933
		2934	our @ISA = CFClient::UI::VBox::;
		2935
		2936	sub new {
		2937	my $class = shift;
		2938
		2939	$class->SUPER::new (
		2940	fontsize => 0.8,
		2941	@_,
		2942	)
		2943	}
		2944
		2945	sub reorder {
		2946	my ($self) = @_;
		2947	my $NOW = time;
		2948
		2949	while (my ($k, $v) = each %{ $self->{item} }) {
		2950	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2951	}
		2952
		2953	my @widgets;
		2954
		2955	my @items = sort {
		2956	$a->{pri} <=> $b->{pri}
		2957	or $b->{id} <=> $a->{id}
		2958	} values %{ $self->{item} };
		2959
		2960	my $count = 10 + 1;
		2961	for my $item (@items) {
		2962	last unless --$count;
		2963
		2964	push @widgets, $item->{label} ||= do {
		2965	# TODO: doesn't handle markup well (read as: at all)
		2966	my $short = $item->{count} > 1
		2967	? "<b>$item->{count} ×</b> $item->{text}"
		2968	: $item->{text};
		2969
		2970	for ($short) {
		2971	s/^\s+//;
		2972	s/\s+/ /g;
		2973	}
		2974
		2975	new CFClient::UI::Label
		2976	markup => $short,
		2977	tooltip => $item->{tooltip},
		2978	tooltip_font => $::FONT_PROP,
		2979	tooltip_width => 0.67,
		2980	fontsize => $item->{fontsize} || $self->{fontsize},
		2981	max_w => $::WIDTH * 0.44,
		2982	fg => $item->{fg},
		2983	can_events => 1,
		2984	can_hover => 1
		2985	};
		2986	}
		2987
		2988	$self->clear;
		2989	$self->SUPER::add (reverse @widgets);
		2990	}
		2991
		2992	sub add {
		2993	my ($self, $text, %arg) = @_;
		2994
		2995	$text =~ s/^\s+//;
		2996	$text =~ s/\s+$//;
		2997
		2998	my $timeout = time + ((delete $arg{timeout}) || 60);
		2999
		3000	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		3001
		3002	if (my $item = $self->{item}{$group}) {
		3003	if ($item->{text} eq $text) {
		3004	$item->{count}++;
		3005	} else {
		3006	$item->{count} = 1;
		3007	$item->{text} = $item->{tooltip} = $text;
		3008	}
		3009	$item->{id} = ++$self->{id};
		3010	$item->{timeout} = $timeout;
		3011	delete $item->{label};
		3012	} else {
		3013	$self->{item}{$group} = {
		3014	id => ++$self->{id},
		3015	text => $text,
		3016	timeout => $timeout,
		3017	tooltip => $text,
		3018	fg => [0.8, 0.8, 0.8, 0.8],
		3019	pri => 0,
		3020	count => 1,
		3021	%arg,
		3022	};
		3023	}
		3024
		3025	$self->reorder;
		3026	}
		3027
		3028	sub reconfigure {
		3029	my ($self) = @_;
		3030
		3031	delete $_->{label}
		3032	for values %{ $self->{item} || {} };
		3033
		3034	$self->reorder;
		3035	$self->SUPER::reconfigure;
		3036	}
		3037
		3038	#############################################################################
		3039
2683	package CFClient::UI::Root;	3040	package CFClient::UI::Root;
2684		3041
2685	our @ISA = CFClient::UI::Container::;	3042	our @ISA = CFClient::UI::Container::;
2686		3043
2687	use CFClient::OpenGL;	3044	use CFClient::OpenGL;
2688		3045
		3046	sub new {
		3047	my $class = shift;
		3048
		3049	$class->SUPER::new (
		3050	@_,
		3051	)
		3052	}
		3053
		3054	sub configure {
		3055	my ($self, $x, $y, $w, $h) = @_;
		3056
		3057	$self->{w} = $w;
		3058	$self->{h} = $h;
		3059	}
		3060
2689	sub check_size {	3061	sub check_size {
2690	my ($self) = @_;	3062	my ($self) = @_;
2691		3063
2692	$self->configure (0, 0, $self->{w}, $self->{h});	3064	$self->size_allocate ($self->{w}, $self->{h})
		3065	if $self->{w};
2693	}	3066	}
2694		3067
2695	sub size_request {	3068	sub size_request {
2696	my ($self) = @_;	3069	my ($self) = @_;
2697		3070
…		…
2699	}	3072	}
2700		3073
2701	sub size_allocate {	3074	sub size_allocate {
2702	my ($self, $w, $h) = @_;	3075	my ($self, $w, $h) = @_;
2703		3076
2704	my $old_w = $self->{old_w};
2705	my $old_h = $self->{old_h};
2706
2707	if ($old_w && $old_h) {
2708	for my $child ($self->children) {
2709	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717	}
2718	}
2719
2720	$self->{old_w} = $w;
2721	$self->{old_h} = $h;
2722	}
2723
2724	sub configure {
2725	my ($self, $x, $y, $w, $h) = @_;
2726
2727	$self->SUPER::configure ($x, $y, $w, $h);
2728
2729	for my $child ($self->children) {	3077	for my $child ($self->children) {
2730	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3078	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2731		3079
		3080	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3081	if exists $child->{req_x};
		3082
		3083	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3084	if exists $child->{req_y};
		3085
2732	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3086	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2733	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3087	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3088
2734	$child->configure ($X, $Y, $W, $H);	3089	$child->configure ($X, $Y, $W, $H);
2735	}	3090	}
2736	}	3091	}
2737		3092
2738	sub _topleft {	3093	sub coord2local {
2739	my ($self, $x, $y) = @_;	3094	my ($self, $x, $y) = @_;
2740		3095
2741	($x, $y)	3096	($x, $y)
2742	}	3097	}
2743		3098
		3099	sub coord2global {
		3100	my ($self, $x, $y) = @_;
		3101
		3102	($x, $y)
		3103	}
		3104
2744	sub update {	3105	sub update {
2745	my ($self) = @_;	3106	my ($self) = @_;
2746		3107
2747	$self->check_size;	3108	$self->check_size;
2748	::refresh ();	3109	$::WANT_REFRESH++;
2749	}	3110	}
2750		3111
2751	sub add {	3112	sub add {
2752	my ($self, $child) = @_;	3113	my ($self, @children) = @_;
2753		3114
		3115	for (my @widgets = @children; my $w = pop @widgets; ) {
		3116	push @widgets, $w->children;
		3117	$w->{root} = $self;
		3118	$w->{visible} = 1;
		3119	}
		3120
		3121	for my $child (@children) {
		3122	$child->{is_toplevel} = 1;
		3123
2754	# integerize window positions	3124	# integerise window positions
2755	$child->{x} = int $child->{x};	3125	$child->{x} = int $child->{x};
2756	$child->{y} = int $child->{y};	3126	$child->{y} = int $child->{y};
		3127	}
2757		3128
2758	$self->SUPER::add ($child);	3129	$self->SUPER::add (@children);
		3130	}
		3131
		3132	sub remove {
		3133	my ($self, @children) = @_;
		3134
		3135	$self->SUPER::remove (@children);
		3136
		3137	while (@children) {
		3138	my $w = pop @children;
		3139	push @children, $w->children;
		3140	$w->set_invisible;
		3141	}
2759	}	3142	}
2760		3143
2761	sub on_refresh {	3144	sub on_refresh {
2762	my ($self, $id, $cb) = @_;	3145	my ($self, $id, $cb) = @_;
2763		3146
2764	$self->{refresh_hook}{$id} = $cb;	3147	$self->{refresh_hook}{$id} = $cb;
2765	}	3148	}
2766		3149
		3150	sub on_post_alloc {
		3151	my ($self, $id, $cb) = @_;
		3152
		3153	$self->{post_alloc_hook}{$id} = $cb;
		3154	}
		3155
2767	sub draw {	3156	sub draw {
2768	my ($self) = @_;	3157	my ($self) = @_;
2769		3158
2770	while (my $rcb = delete $self->{refresh_hook}) {	3159	while ($self->{refresh_hook}) {
2771	$_->() for values %$rcb;	3160	$_->()
		3161	for values %{delete $self->{refresh_hook}};
		3162	}
		3163
		3164	if ($self->{check_size}) {
		3165	my @queue = ([], []);
		3166
		3167	for (;;) {
		3168	if ($self->{check_size}) {
		3169	# heuristic: check containers last
		3170	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3171	for values %{delete $self->{check_size}}
		3172	}
		3173
		3174	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3175
		3176	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3177	? @$widget{qw(user_w user_h)}
		3178	: $widget->size_request;
		3179
		3180	if (delete $widget->{force_alloc}
		3181	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3182	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3183
		3184	$widget->{req_w} = $w;
		3185	$widget->{req_h} = $h;
		3186
		3187	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3188
		3189	$widget->{parent}->check_size
		3190	if $widget->{parent};
		3191	}
		3192	}
		3193	}
		3194
		3195	while ($self->{size_alloc}) {
		3196	for (values %{delete $self->{size_alloc}}) {
		3197	my ($widget, $w, $h) = @$_;
		3198
		3199	$w = 0 if $w < 0;
		3200	$h = 0 if $h < 0;
		3201
		3202	$widget->{w} = $w;
		3203	$widget->{h} = $h;
		3204	$widget->emit (size_allocate => $w, $h);
		3205	}
		3206	}
		3207
		3208	while ($self->{post_alloc_hook}) {
		3209	$_->()
		3210	for values %{delete $self->{post_alloc_hook}};
2772	}	3211	}
2773		3212
2774	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3213	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2775	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3214	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2776	glClear GL_COLOR_BUFFER_BIT;	3215	glClear GL_COLOR_BUFFER_BIT;
2777		3216
2778	glMatrixMode GL_PROJECTION;	3217	glMatrixMode GL_PROJECTION;
2779	glLoadIdentity;	3218	glLoadIdentity;
2780	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3219	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2781	glMatrixMode GL_MODELVIEW;	3220	glMatrixMode GL_MODELVIEW;
2782	glLoadIdentity;	3221	glLoadIdentity;
2783		3222
2784	$self->_draw;	3223	$self->_draw;
2785	}	3224	}
…		…
2787	#############################################################################	3226	#############################################################################
2788		3227
2789	package CFClient::UI;	3228	package CFClient::UI;
2790		3229
2791	$ROOT = new CFClient::UI::Root;	3230	$ROOT = new CFClient::UI::Root;
2792	$TOOLTIP = new CFClient::UI::Tooltip;	3231	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2793		3232
2794	1	3233	1
2795		3234

Diff Legend

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